Merge pull request #7455 from ranjanyash54/dev_3

ospf6d: Json support added for command "show ipv6 ospf6 redistribute [json]"

diff --cc doc/user/ospf6d.rst
index 43f922db329e8186e22d53e5ccc737ef982ecd05,f5f80e75eec98c6575c9215782e25b39e080324c..040123cd6f839931a67bfec6c878cdbb2403aa06
--- 1/doc/user/ospf6d.rst
--- 2/doc/user/ospf6d.rst
+++ b/doc/user/ospf6d.rst
@@@ -197,12 -195,17 +197,18 @@@ Showing OSPF6 informatio
  
     This command shows internal routing table.
  
 -.. index:: show ipv6 ospf6 zebra
 -.. clicmd:: show ipv6 ospf6 zebra
 +.. index:: show ipv6 ospf6 zebra [json]
 +.. clicmd:: show ipv6 ospf6 zebra [json]
  
 -   Shows state about what is being redistributed between zebra and OSPF6
 +   Shows state about what is being redistributed between zebra and OSPF6.
 +   JSON output can be obtained by appending "json" at the end.
  
+ .. index:: show ipv6 ospf6 redistribute [json]
+ .. clicmd:: show ipv6 ospf6 redistribute [json]
+ 
+    Shows the routes which are redistributed by the router. JSON output can
+    be obtained by appending 'json' at the end.
+ 
  OSPF6 Configuration Examples
  ============================
  

diff --cc ospf6d/ospf6_asbr.c
Simple merge