Merge remote-tracking branch 'origin/stable/2.0'

diff --cc cumulus/start-stop-daemon.c
Simple merge

diff --cc doc/Building_FRR_on_Ubuntu1204.md
index 2d6ccffd9ffcf9d5d3a9ce8afd50b3ff70bc9955,f13052a1bb0188040fec1605c75db08c6e8f4291..521f0a0c2bb8c5cf40b8e96a6d746acca5c8e868
--- 1/doc/Building_FRR_on_Ubuntu1204.md
--- 2/doc/Building_FRR_on_Ubuntu1204.md
+++ b/doc/Building_FRR_on_Ubuntu1204.md
@@@ -75,8 -75,10 +75,9 @@@ an example.
  
      git clone https://github.com/frrouting/frr.git frr
      cd frr
 -    git checkout stable/2.0
      ./bootstrap.sh
      ./configure \
+         --prefix=/usr \
          --enable-exampledir=/usr/share/doc/frr/examples/ \
          --localstatedir=/var/run/frr \
          --sbindir=/usr/lib/frr \

diff --cc doc/Building_FRR_on_Ubuntu1404.md
index 5da423affc5cc827525f59813c003b4cbc4850ca,7e21df861448acdd7c4fe74c86d5f97d3aed0f49..2c5f132ad7f62cbff9db9736a7433929cc1021f1
--- 1/doc/Building_FRR_on_Ubuntu1404.md
--- 2/doc/Building_FRR_on_Ubuntu1404.md
+++ b/doc/Building_FRR_on_Ubuntu1404.md
@@@ -35,8 -35,10 +35,9 @@@ an example.
  
      git clone https://github.com/frrouting/frr.git frr
      cd frr
 -    git checkout stable/2.0
      ./bootstrap.sh
      ./configure \
+         --prefix=/usr \
          --enable-exampledir=/usr/share/doc/frr/examples/ \
          --localstatedir=/var/run/frr \
          --sbindir=/usr/lib/frr \

diff --cc ospfd/ospf_vty.c
index b4c456e0aa8532a62d09bb3ef2ee4be3d417dae3,2724df98a0dcc571644ca1fcacd8c4bf03dd89cc..8e6ecb57eb2cf8d65d6616bb5e88f25c8ae1510a
--- 1/ospfd/ospf_vty.c
--- 2/ospfd/ospf_vty.c
+++ b/ospfd/ospf_vty.c
@@@ -6331,9 -7058,8 +6331,9 @@@ DEFUN (no_ip_ospf_dead_interval
         "Seconds\n"
         "Address of interface")
  {
 -  struct interface *ifp = vty->index;
 +  VTY_DECLVAR_CONTEXT(interface, ifp);
 +  int idx_ipv4 = argc - 1;
-   struct in_addr addr;
+   struct in_addr addr = { .s_addr = 0L};
    int ret;
    struct ospf_if_params *params;
    struct ospf_interface *oi;
@@@ -6457,19 -7230,21 +6457,20 @@@ DEFUN (no_ip_ospf_hello_interval
         NO_STR
         "IP Information\n"
         "OSPF interface commands\n"
 -       "Time between HELLO packets\n"
 +       "Time between HELLO packets\n" // ignored
         "Seconds\n"
 -       "Address of interface")
 +       "Address of interface\n")
  {
 -  struct interface *ifp = vty->index;
 +  VTY_DECLVAR_CONTEXT(interface, ifp);
 +  int idx = 0;
    struct in_addr addr;
 -  int ret;
    struct ospf_if_params *params;
 -  
++
    params = IF_DEF_PARAMS (ifp);
  
 -  if (argc == 2)
 +  if (argv_find (argv, argc, "A.B.C.D", &idx))
      {
 -      ret = inet_aton(argv[1], &addr);
 -      if (!ret)
 +      if(!inet_aton(argv[idx]->arg, &addr))
        {
          vty_out (vty, "Please specify interface address by A.B.C.D%s",
                   VTY_NEWLINE);