Merge pull request #247 from batfish/unstable

prepare for 0.29.0
batfish · Jul 21, 2017 · cb32dc0 · cb32dc0
2 parents 02801ce + 59f7cbc
commit cb32dc0
Show file tree

Hide file tree

Showing 27 changed files with 46 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,6 +4,9 @@
 .DS_Store
 *.testout
 
+# ignore maven pom version backups
+pom.xml.versionsBackup
+
 # IntelliJ project files that should not be shared, per:
 # https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
 workspace.xml

diff --git a/projects/allinone/pom.xml b/projects/allinone/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.28.1</version>
+    <version>0.29.0</version>
   </parent>
 
   <artifactId>allinone</artifactId>

diff --git a/projects/batfish-client/pom.xml b/projects/batfish-client/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.28.1</version>
+    <version>0.29.0</version>
   </parent>
 
   <artifactId>batfish-client</artifactId>

diff --git a/projects/batfish-common-protocol/pom.xml b/projects/batfish-common-protocol/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.28.1</version>
+    <version>0.29.0</version>
   </parent>
 
   <artifactId>batfish-common-protocol</artifactId>

diff --git a/projects/batfish/pom.xml b/projects/batfish/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.28.1</version>
+    <version>0.29.0</version>
   </parent>
 
   <artifactId>batfish</artifactId>

diff --git a/projects/coordinator/pom.xml b/projects/coordinator/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.28.1</version>
+    <version>0.29.0</version>
   </parent>
 
   <artifactId>coordinator</artifactId>

diff --git a/projects/pom.xml b/projects/pom.xml
@@ -8,7 +8,7 @@
 
   <groupId>org.batfish</groupId>
   <artifactId>batfish-parent</artifactId>
-  <version>0.28.1</version>
+  <version>0.29.0</version>
 
   <packaging>pom</packaging>
 

diff --git a/projects/question/pom.xml b/projects/question/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.batfish</groupId>
     <artifactId>batfish-parent</artifactId>
-    <version>0.28.1</version>
+    <version>0.29.0</version>
   </parent>
 
   <artifactId>question</artifactId>

diff --git a/test_rigs/parsing-tests/dc-as-reuse.ref b/test_rigs/parsing-tests/dc-as-reuse.ref
@@ -4680,7 +4680,7 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -4836,7 +4836,7 @@
           }
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/disable-as-suppression.ref b/test_rigs/parsing-tests/disable-as-suppression.ref
@@ -269,11 +269,11 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/example-juniper.ref b/test_rigs/parsing-tests/example-juniper.ref
@@ -10365,7 +10365,7 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -10494,7 +10494,7 @@
           }
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/test_rigs/parsing-tests/example.ref b/test_rigs/parsing-tests/example.ref
@@ -10699,7 +10699,7 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -10842,7 +10842,7 @@
           }
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/test_rigs/parsing-tests/indirection.ref b/test_rigs/parsing-tests/indirection.ref
@@ -944,11 +944,11 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/isis.ref b/test_rigs/parsing-tests/isis.ref
@@ -2445,11 +2445,11 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/policy-routing.ref b/test_rigs/parsing-tests/policy-routing.ref
@@ -1904,11 +1904,11 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/snat.ref b/test_rigs/parsing-tests/snat.ref
@@ -458,11 +458,11 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/srx-testbed.ref b/test_rigs/parsing-tests/srx-testbed.ref
@@ -5912,7 +5912,7 @@
           ]
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -5930,7 +5930,7 @@
           }
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/test_rigs/parsing-tests/unit-tests.ref b/test_rigs/parsing-tests/unit-tests.ref
@@ -32002,7 +32002,7 @@
           ]
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "bgp_address_family" : {
           "Red flags" : {
@@ -33119,7 +33119,7 @@
           }
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "address_family" : {
           "Red flags" : {

diff --git a/tests/basic/genDp-delta.ref b/tests/basic/genDp-delta.ref
@@ -34,7 +34,7 @@
         "8" : 301
       },
       "ospfInternalIterations" : 3,
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     }
   ],
   "status" : "SUCCESS"

diff --git a/tests/basic/genDp.ref b/tests/basic/genDp.ref
@@ -34,7 +34,7 @@
         "8" : 298
       },
       "ospfInternalIterations" : 3,
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     }
   ],
   "status" : "SUCCESS"

diff --git a/tests/basic/init-dc-as-reuse.ref b/tests/basic/init-dc-as-reuse.ref
@@ -26,7 +26,7 @@
         "pod_1_tor_0" : "PASSED",
         "pod_1_tor_1" : "PASSED"
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -182,7 +182,7 @@
           }
         }
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/tests/basic/init-delta.ref b/tests/basic/init-delta.ref
@@ -40,7 +40,7 @@
         "testrig/iptables/host1.iptables" : "PASSED",
         "testrig/iptables/host2.iptables" : "PASSED"
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -180,7 +180,7 @@
           }
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/tests/basic/init-snat.ref b/tests/basic/init-snat.ref
@@ -12,11 +12,11 @@
         "us_border" : "PASSED",
         "us_switch" : "PASSED"
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.InitInfoAnswerElement",

diff --git a/tests/basic/init-unit-tests.ref b/tests/basic/init-unit-tests.ref
@@ -362,7 +362,7 @@
         "vrf_context" : "PASSED",
         "vxlan" : "PASSED"
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "bgp_address_family" : {
           "Red flags" : {
@@ -1479,7 +1479,7 @@
           }
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "address_family" : {
           "Red flags" : {

diff --git a/tests/basic/init.ref b/tests/basic/init.ref
@@ -40,7 +40,7 @@
         "testrig/iptables/host1.iptables" : "PASSED",
         "testrig/iptables/host2.iptables" : "PASSED"
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -183,7 +183,7 @@
           }
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/tests/ui-focused/init0.ref b/tests/ui-focused/init0.ref
@@ -40,7 +40,7 @@
         "testrig/iptables/host1.iptables" : "PASSED",
         "testrig/iptables/host2.iptables" : "PASSED"
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -183,7 +183,7 @@
           }
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {

diff --git a/tests/ui-focused/init1.ref b/tests/ui-focused/init1.ref
@@ -40,7 +40,7 @@
         "testrig/iptables/host1.iptables" : "PASSED",
         "testrig/iptables/host2.iptables" : "PASSED"
       },
-      "version" : "0.28.1"
+      "version" : "0.29.0"
     },
     {
       "class" : "org.batfish.datamodel.answers.ConvertConfigurationAnswerElement",
@@ -183,7 +183,7 @@
           }
         }
       },
-      "version" : "0.28.1",
+      "version" : "0.29.0",
       "warnings" : {
         "as1border1" : {
           "Red flags" : {