lp:~dobey/ubuntuone-dev-tools/update-from-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:ubuntuone-dev-tools/stable-3-0 at revision 61

Eric Casteleijn (community): Approve on 2012-04-03

Diff: 1003 lines (+557/-34)

29 files modified

LICENSE (+28/-0)
LICENSE.OpenSSL (+137/-0)
MANIFEST.in (+1/-1)
bin/u1lint (+14/-2)
bin/u1lint.bat (+13/-0)
bin/u1trial (+14/-2)
bin/u1trial.bat (+13/-0)
setup.py (+20/-7)
ubuntuone/__init__.py (+14/-1)
ubuntuone/devtools/handlers.py (+14/-2)
ubuntuone/devtools/reactors/gi.py (+13/-0)
ubuntuone/devtools/reactors/glib.py (+14/-1)
ubuntuone/devtools/reactors/qt4.py (+14/-1)
ubuntuone/devtools/reactors/twisted.py (+14/-1)
ubuntuone/devtools/reactors/txnp.py (+14/-1)
ubuntuone/devtools/services/__init__.py (+14/-1)
ubuntuone/devtools/services/dbus.py (+14/-1)
ubuntuone/devtools/services/squid.py (+14/-1)
ubuntuone/devtools/services/tests/test_dbus.py (+27/-0)
ubuntuone/devtools/services/tests/test_squid.py (+14/-1)
ubuntuone/devtools/testcase.py (+14/-1)
ubuntuone/devtools/testcases/__init__.py (+14/-2)
ubuntuone/devtools/testcases/dbus.py (+14/-2)
ubuntuone/devtools/testcases/squid.py (+14/-2)
ubuntuone/devtools/testcases/tests/__init__.py (+13/-0)
ubuntuone/devtools/testcases/tests/test_squid_testcase.py (+14/-1)
ubuntuone/devtools/testing/txcheck.py (+14/-2)
ubuntuone/devtools/tests/test_decorators.py (+14/-1)
ubuntuone/devtools/tests/test_txcheck.py (+26/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

61. By dobey on 2012-04-03

License exception for linking to OpenSSL

60. By dobey on 2012-03-20

[release] 2.99.91

59. By dobey on 2012-03-06

[release] 2.99.90

58. By dobey on 2012-02-21

[release] 2.99.5

57. By dobey on 2012-02-15

[release] 2.99.4

56. By dobey on 2012-02-07

[release] 2.99.3

55. By dobey on 2012-02-07

[Brian Curtin]

  - Actually install the recently added batch files for Windows.
  - Check the $PATH for python.exe on Windows.

[Rodney Dawes]

  - Add a module for using the new gireactor/gtk3reactor in twisted 12.
  - Fix a trailing whitespace lint error.

54. By dobey on 2012-01-17

[release] 2.99.2

53. By Manuel de la Peña on 2012-01-17

[Manuel de la Peña]

    Provide batch scripts for u1trial and u1lint on Windows.
    Provide a new SquidTestCase for running tests with a private squid instance.

[Rodney Dawes]

    Add missing squid.conf.in to setup.py

52. By dobey on 2012-01-03

[release] 2.99.1