From 5ce9b9af5a7c00f0a6d4f320538a03ec380521c6 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 21 Aug 2018 20:28:16 -0700
Subject: [PATCH 1/2] Merge PR #2015: Change gaiad testnet example output flag

Closes #1960.
---
 Makefile                 | 2 +-
 networks/local/README.md | 2 +-
 server/testnet.go        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 3e0c36da6a..b35e3f5c9a 100644
--- a/Makefile
+++ b/Makefile
@@ -204,7 +204,7 @@ build-docker-gaiadnode:
 
 # Run a 4-node testnet locally
 localnet-start: localnet-stop
-	@if ! [ -f build/node0/gaiad/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/gaiad:Z tendermint/gaiadnode testnet --v 4 --o . --starting-ip-address 192.168.10.2 ; fi
+	@if ! [ -f build/node0/gaiad/config/genesis.json ]; then docker run --rm -v $(CURDIR)/build:/gaiad:Z tendermint/gaiadnode testnet --v 4 -o . --starting-ip-address 192.168.10.2 ; fi
 	docker-compose up -d
 
 # Stop testnet
diff --git a/networks/local/README.md b/networks/local/README.md
index 3a0f855be0..ef5e27803d 100644
--- a/networks/local/README.md
+++ b/networks/local/README.md
@@ -61,7 +61,7 @@ rm -rf ./build
 make build-linux
 
 # Create configuration
-docker run -v `pwd`/build:/gaiad tendermint/gaiadnode testnet --o . --v 1
+docker run -v `pwd`/build:/gaiad tendermint/gaiadnode testnet -o . --v 1
 
 #Run the node
 docker run -v `pwd`/build:/gaiad tendermint/gaiadnode
diff --git a/server/testnet.go b/server/testnet.go
index d7e4ec9ac7..93f563005f 100644
--- a/server/testnet.go
+++ b/server/testnet.go
@@ -20,7 +20,7 @@ import (
 var (
 	nodeDirPrefix = "node-dir-prefix"
 	nValidators   = "v"
-	outputDir     = "o"
+	outputDir     = "output-dir"
 
 	startingIPAddress = "starting-ip-address"
 )
@@ -49,7 +49,7 @@ Example:
 	}
 	cmd.Flags().Int(nValidators, 4,
 		"Number of validators to initialize the testnet with")
-	cmd.Flags().String(outputDir, "./mytestnet",
+	cmd.Flags().StringP(outputDir, "o", "./mytestnet",
 		"Directory to store initialization data for the testnet")
 	cmd.Flags().String(nodeDirPrefix, "node",
 		"Prefix the directory name for each node with (node results in node0, node1, ...)")

From d8f01be2118e1007c5eb56073c19927dd57be896 Mon Sep 17 00:00:00 2001
From: Matthew Slipper <me@matthewslipper.com>
Date: Tue, 21 Aug 2018 20:44:13 -0700
Subject: [PATCH 2/2] Merge PR #2061: Change proposalID to proposal-id in gov
 REST

Close #1963.
---
 PENDING.md                | 1 +
 x/gov/client/rest/rest.go | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/PENDING.md b/PENDING.md
index cb80119a95..c4b04238cd 100644
--- a/PENDING.md
+++ b/PENDING.md
@@ -8,6 +8,7 @@ BREAKING CHANGES
 * Gaia CLI  (`gaiacli`)
     * [x/stake] Validator.Owner renamed to Validator.Operator
     * [cli] unsafe_reset_all, show_validator, and show_node_id have been renamed to unsafe-reset-all, show-validator, and show-node-id
+    * [cli] \#2061 changed proposalID in governance REST endpoints to proposal-id
     * [cli] \#2014 `gaiacli advanced` no longer exists - to access `ibc`, `rest-server`, and `validator-set` commands use `gaiacli ibc`, `gaiacli rest-server`, and `gaiacli tendermint`, respectively
 
 * Gaia
diff --git a/x/gov/client/rest/rest.go b/x/gov/client/rest/rest.go
index a410c7791e..22283a652e 100644
--- a/x/gov/client/rest/rest.go
+++ b/x/gov/client/rest/rest.go
@@ -17,7 +17,7 @@ import (
 // REST Variable names
 // nolint
 const (
-	RestProposalID     = "proposalID"
+	RestProposalID     = "proposal-id"
 	RestDepositer      = "depositer"
 	RestVoter          = "voter"
 	RestProposalStatus = "status"