darkbushido 26e7fe15f9 Merge branch 'upstream' into staging/rails-4.0 ...

Conflicts:
	Gemfile.lock

2015-05-05 11:00:38 -05:00

..

base

Land #5297 : Track machine_id and dead sessions

2015-05-05 17:08:39 +10:00

core

Merge branch 'upstream' into staging/rails-4.0

2015-05-05 11:00:38 -05:00

http

Update comment in wordpress/version.rb

2015-05-01 17:05:31 -05:00

java/rmi

fix some yarddoc issues

2015-04-20 00:06:59 +02:00

kerberos

Correct YARD doc comments

2015-04-02 16:14:25 +05:00

scripts

Refactor WindowsServices

2012-11-06 17:30:04 -06:00

ui

Merge branch 'upstream' into staging/rails-4.0

2015-05-01 11:26:24 -05:00

util

Fix persistence script to support x64 payloads

2015-04-19 12:41:51 +10:00

base.rb

Fix Undocumentable method, missing name YARD warning

2013-03-30 15:32:38 -05:00

core.rb

Remove old JMX mixin

2015-03-23 15:48:10 -05:00

events.rb

Retab lib

2013-08-30 16:28:33 -05:00

LICENSE

…

sanity.rb

Revert "Various merge resolutions from master <- staging"

2014-08-22 10:17:44 -05:00

ui.rb

Mark all libraries as defaulting to 8-bit strings

2012-06-29 00:18:28 -05:00

util.rb

Mark all libraries as defaulting to 8-bit strings

2012-06-29 00:18:28 -05:00

windows_error.rb

Retab lib

2013-08-30 16:28:33 -05:00