Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
sync with master
  • Loading branch information
Valeria1235 committed Mar 1, 2018
commit 8f6b8a404f194375d938ba45d69262a960e05be0
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ ext_conf = "shared_preload_libraries = 'postgres_fdw'"
with testgres.get_new_node().init() as master:

# ... do something ...

# reset main config file
master.default_conf(fsync=True,
allow_streaming=True)
Expand All @@ -174,7 +174,7 @@ the configuration file, which means that they should be called before `append_co

## Authors

[Ildar Musin](https://github.com/zilder) <i.musin(at)postgrespro.ru> Postgres Professional Ltd., Russia
[Dmitry Ivanov](https://github.com/funbringer) <d.ivanov(at)postgrespro.ru> Postgres Professional Ltd., Russia
[Ildus Kurbangaliev](https://github.com/ildus) <i.kurbangaliev(at)postgrespro.ru> Postgres Professional Ltd., Russia
[Yury Zhuravlev](https://github.com/stalkerg) <stalkerg(at)gmail.com>
[Ildar Musin](https://github.com/zilder) <i.musin(at)postgrespro.ru> Postgres Professional Ltd., Russia
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Better not to touch here, these spaces at the end have special meaning for github markdown, without them all these lines will not be on separate lines. Anyway this change isn't related with enums :)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These lines should end with two spaces, or else the whole paragraph will look awful.

[Dmitry Ivanov](https://github.com/funbringer) <d.ivanov(at)postgrespro.ru> Postgres Professional Ltd., Russia
[Ildus Kurbangaliev](https://github.com/ildus) <i.kurbangaliev(at)postgrespro.ru> Postgres Professional Ltd., Russia
[Yury Zhuravlev](https://github.com/stalkerg) <stalkerg(at)gmail.com>
2 changes: 2 additions & 0 deletions testgres/backup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

from shutil import rmtree, copytree
from six import raise_from
from tempfile import mkdtemp

from .enums import XLogMethod

from .consts import \
Expand Down
4 changes: 4 additions & 0 deletions testgres/connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@

from .enums import IsolationLevel

from .defaults import \
default_dbname, \
default_username

from .exceptions import QueryException


Expand Down
5 changes: 2 additions & 3 deletions testgres/node.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import subprocess
import time

from shutil import rmtree
from six import raise_from
from tempfile import mkstemp, mkdtemp

Expand Down Expand Up @@ -845,9 +846,7 @@ def backup(self, **kwargs):
A smart object of type NodeBackup.
"""

return NodeBackup(node=self,
username=username,
xlog_method=xlog_method)
return NodeBackup(node=self, **kwargs)

def replicate(self, name=None, **kwargs):
"""
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.