More REST property removal.

Former-commit-id: 7059070
basho · Mar 12, 2015 · e9d005d · e9d005d
1 parent 7509094
commit e9d005d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 26 deletions.
diff --git a/SECURITY.md b/SECURITY.md
@@ -83,13 +83,13 @@ Riak Security:
     <nodes>
       <node name="node1"
             hostAddress="riak-node1.mydomain.internal"
-            pbcPort="8097" restScheme="http" restPort="8098" poolSize="16" />
+            pbcPort="8097" poolSize="16" />
       <node name="node2"
             hostAddress="riak-node2.mydomain.internal"
-            pbcPort="8097" restScheme="http" restPort="8098" poolSize="16" />
+            pbcPort="8097" poolSize="16" />
       <node name="node3"
             hostAddress="riak-node3.mydomain.internal"
-            pbcPort="8097" restScheme="http" restPort="8098" poolSize="16" />
+            pbcPort="8097" poolSize="16" />
     </nodes>
   </riakConfiguration>
 </configuration>

diff --git a/buildbot/App.config b/buildbot/App.config
@@ -35,8 +35,6 @@
     <nodes>
       <node name="dev1" hostAddress="127.0.0.1"
             pbcPort="8087"
-            restScheme="http"
-            restPort="8098"
             poolSize="32" />
     </nodes>
   </riak1NodeConfiguration>
@@ -48,7 +46,7 @@
        clientCertificateSubject="E=riakuser@myorg.com, CN=riakuser, OU=Development, O=Basho Technologies, S=WA, C=US"
        checkCertificateRevocation="false" />
     <nodes>
-      <node name="dev1" hostAddress="127.0.0.1" pbcPort="8087" restScheme="http" restPort="8098" poolSize="16" networkConnectTimeout="1" />
+      <node name="dev1" hostAddress="127.0.0.1" pbcPort="8087" poolSize="16" networkConnectTimeout="1" />
     </nodes>
   </riakShortConnectConfiguration>
 
@@ -59,7 +57,7 @@
        clientCertificateSubject="E=riakuser@myorg.com, CN=riakuser, OU=Development, O=Basho Technologies, S=WA, C=US"
        checkCertificateRevocation="false" />
     <nodes>
-      <node name="dev1" hostAddress="127.0.0.1" pbcPort="8087" restScheme="http" restPort="8098" poolSize="16" networkReadTimeout="1" />
+      <node name="dev1" hostAddress="127.0.0.1" pbcPort="8087" poolSize="16" networkReadTimeout="1" />
     </nodes>
   </riakShortReadConfiguration>
 
@@ -70,7 +68,7 @@
        clientCertificateSubject="E=riakuser@myorg.com, CN=riakuser, OU=Development, O=Basho Technologies, S=WA, C=US"
        checkCertificateRevocation="false" />
     <nodes>
-      <node name="dev1" hostAddress="127.0.0.1" pbcPort="8087" restScheme="http" restPort="8098" poolSize="16" networkWriteTimeout="1" />
+      <node name="dev1" hostAddress="127.0.0.1" pbcPort="8087" poolSize="16" networkWriteTimeout="1" />
     </nodes>
   </riakShortWriteConfiguration>
 
@@ -79,8 +77,6 @@
       <node name="dev1"
             hostAddress="127.0.0.1"
             pbcPort="8087"
-            restScheme="http"
-            restPort="8098"
             poolSize="32" />
     </nodes>
   </riak1NodeNoAuthConfiguration>

diff --git a/src/NuGet/Content/App.config.transform b/src/NuGet/Content/App.config.transform
@@ -10,26 +10,18 @@
             <node name="dev1"
                   hostAddress="riak-test"
                   pbcPort="10017"
-                  restScheme="http"
-                  restPort="10018"
                   poolSize="20" />
             <node name="dev2"
                   hostAddress="riak-test"
                   pbcPort="10027"
-                  restScheme="http"
-                  restPort="10028"
                   poolSize="20" />
             <node name="dev3"
                   hostAddress="riak-test"
                   pbcPort="10037"
-                  restScheme="http"
-                  restPort="10038"
                   poolSize="20" />
             <node name="dev4"
                   hostAddress="riak-test"
                   pbcPort="10047"
-                  restScheme="http"
-                  restPort="10048"
                   poolSize="20" />
         </nodes>
     </riakConfig>

diff --git a/src/NuGet/Content/web.config.transform b/src/NuGet/Content/web.config.transform
@@ -10,26 +10,18 @@
             <node name="dev1"
                   hostAddress="riak-test"
                   pbcPort="10017"
-                  restScheme="http"
-                  restPort="10018"
                   poolSize="20" />
             <node name="dev2"
                   hostAddress="riak-test"
                   pbcPort="10027"
-                  restScheme="http"
-                  restPort="10028"
                   poolSize="20" />
             <node name="dev3"
                   hostAddress="riak-test"
                   pbcPort="10037"
-                  restScheme="http"
-                  restPort="10038"
                   poolSize="20" />
             <node name="dev4"
                   hostAddress="riak-test"
                   pbcPort="10047"
-                  restScheme="http"
-                  restPort="10048"
                   poolSize="20" />
         </nodes>
     </riakConfig>