Commit5707835

committed

Merge branch 'default-users' into multihost-catchup

2 parents59a15f3 +01e6a7b commit5707835Copy full SHA for 5707835

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@`
`27`	`27`	`readme=f.read()`
`28`	`28`
`29`	`29`	`setup(`
`30`		`-version='1.10.0',`
	`30`	`+version='1.10.1',`
`31`	`31`	`name='testgres',`
`32`	`32`	`packages=['testgres','testgres.operations','testgres.helpers'],`
`33`	`33`	`description='Testing utility for PostgreSQL and its extensions',`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ def __init__(self, conn_params: ConnectionParams):`
`45`	`45`	`super().__init__(conn_params.username)`
`46`	`46`	`self.conn_params=conn_params`
`47`	`47`	`self.host=conn_params.host`
`48`		`-self.ssh_key=conn_params.ssh_key`
`49`	`48`	`self.port=conn_params.port`
	`49`	`+self.ssh_key=conn_params.ssh_key`
`50`	`50`	`self.ssh_args= []`
`51`	`51`	`ifself.ssh_key:`
`52`	`52`	`self.ssh_args+= ["-i",self.ssh_key]`
`@@ -286,7 +286,7 @@ def write(self, filename, data, truncate=False, binary=False, read_and_write=Fal`
`286`	`286`	`mode="r+b"ifbinaryelse"r+"`
`287`	`287`
`288`	`288`	`withtempfile.NamedTemporaryFile(mode=mode,delete=False)astmp_file:`
`289`		`-#Because inscpwe set up port using -P option`
	`289`	`+#Forscpthe port is specified by a "-P" option`
`290`	`290`	`scp_args= ['-P'ifx=='-p'elsexforxinself.ssh_args]`
`291`	`291`
`292`	`292`	`ifnottruncate:`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`fromdistutils.coreimportsetup`
`5`	`5`
`6`	`6`	`setup(`
`7`		`-version='0.0.2',`
	`7`	`+version='0.0.3',`
`8`	`8`	`name='testgres_pg_probackup2',`
`9`	`9`	`packages=['pg_probackup2','pg_probackup2.storage'],`
`10`	`10`	`description='Plugin for testgres that manages pg_probackup2',`

Comments

(0)