Merge branch 'develop' into cli-updates

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

PENDING.md

@@ -10,6 +10,7 @@ BREAKING CHANGES
     * [cli] unsafe_reset_all, show_validator, and show_node_id have been renamed to unsafe-reset-all, show-validator, and show-node-id
     * [cli] \#1983 --print-response now defaults to true in commands that create and send a transaction
     * [cli] \#1983 you can now pass --pubkey or --address to gaiacli keys show to return a plaintext representation of the key's address or public key for use with other commands
+    * [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
 
 

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

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, ...)")

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"