[guardian-dev] [guardianproject/Gibberbot] 5893a5: Work around no smack login on reconnect, make test...

[Nathan Freitas]

  Branch: refs/heads/master
  Home:   https://github.com/guardianproject/Gibberbot
  Commit: 5893a5d1c48e925805c58dc59f542fec1806a214
      https://github.com/guardianproject/Gibberbot/commit/5893a5d1c48e925805c58dc59f542fec1806a214
  Author: devrandom <c1.android at niftybox.net>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M robo-tests/src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnectionTest.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

  Log Message:
  -----------
  Work around no smack login on reconnect, make test deterministic


  Commit: 7aed263f818c81898540f3a67897a602955da317
      https://github.com/guardianproject/Gibberbot/commit/7aed263f818c81898540f3a67897a602955da317
  Author: devrandom <c1.android at niftybox.net>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

  Log Message:
  -----------
  Prevent queuing heartbeats when we have long running tasks due to network issues


  Commit: 76a2e83dbc2ae04dec5264ae2941b3f1092b2442
      https://github.com/guardianproject/Gibberbot/commit/76a2e83dbc2ae04dec5264ae2941b3f1092b2442
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

  Log Message:
  -----------
  small change


  Commit: 78feea46672d1d2153193294545b3bcff9e4d10f
      https://github.com/guardianproject/Gibberbot/commit/78feea46672d1d2153193294545b3bcff9e4d10f
  Author: Nathan Freitas <nathan at freitas.net>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M robo-tests/src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnectionTest.java
  M src/info/guardianproject/otr/app/im/plugin/xmpp/XmppConnection.java

  Log Message:
  -----------
  Merge branch 'devrandom-xmpp'


Compare: https://github.com/guardianproject/Gibberbot/compare/84c5514...78feea4