diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-04-26 18:37:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-04-26 18:37:14 +0200 |
| commit | 0f565573fb5a32f5eb3cd72baf4d69717bb4b991 (patch) | |
| tree | 4619c98cc61d682270fbd08d3c9faaf634507008 /cpp/test | |
| parent | Merge remote-tracking branch 'origin/master' into encoding11 (diff) | |
| parent | Also fixed property cloning for defaults properties (diff) | |
| download | ice-0f565573fb5a32f5eb3cd72baf4d69717bb4b991.tar.bz2 ice-0f565573fb5a32f5eb3cd72baf4d69717bb4b991.tar.xz ice-0f565573fb5a32f5eb3cd72baf4d69717bb4b991.zip | |
Merge remote-tracking branch 'origin/master' into encoding11
Diffstat (limited to 'cpp/test')
| -rwxr-xr-x | cpp/test/IceGrid/admin/run.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/admin/run.py b/cpp/test/IceGrid/admin/run.py index e39f7ec7ed7..402f2bacebd 100755 --- a/cpp/test/IceGrid/admin/run.py +++ b/cpp/test/IceGrid/admin/run.py @@ -226,7 +226,7 @@ print("ok") # print("ok") -# print "completing shutdown...", +# sys.stdout.write("completing shutdown... ") # sys.stdout.flush() # admin = Util.spawn('icegridadmin --Ice.Config=config.admin') |