labofsahil/github-event-dataset-2012 huggingface dataset:
Fix option inconsistency warnings about "proto" and "tun-ipv6"

"tun-ipv6" is only sent in option string if running in point-to-point
mode (= not --server and not --client or --pull), because in those
scenarios it's usually pushed by the server, and the client does not
yet have it when comparing options -> needless warning.

Completely ignore "proto" values when comparing option strings - this
is in preparation for removing proto from the option string in a future
release, and to avoid warnings when 2.3 talks to this future release.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: David Sommerseth <davids@redhat.com>
Message-Id: 1355692520-24362-1-git-send-email-gert@greenie.muc.de
URL: http://article.gmane.org/gmane.network.openvpn.devel/7194
Signed-off-by: David Sommerseth <davids@redhat.com>
[PowerTimers] fix auto timer timeout being seconds, now minuets.
[SoftwareUpdate] fix bug with software update after performing a backup. (2nd try)
[NetworkSetup] fix samba server only control.
made it so that the username, not the id is the link to the user profile
not sure
unsure
personal feed working
made personal feed OR
dropdown box for report creation
paperclip, s3, heroku
fix..not working yet
google maps geo autocomplete support
rough select
universal improvements to site
some more preparations for launch
optimistic active admin heroku fix
another attempt at activeadmin heroku fix
again
heroku is very picky
more attempts
idk whats going on right now
still idk
some minor updates
Solved bag: didn't match some names in videoAction
Registration: Change User's info
Not every device use TI FM radio, moved to device's dependencies

Change-Id: I20f68e93ee81f3bb50560a18d9d9a59a0feaf88d
Added swipe functionality

PID tuning tab interface (tab 2) will determine if swipe functionality
is implemented in the RC versions (Seek bars don't work well with swipe
capability)
Fix name of the ogg test
add by zhutao

完整版
Merging in changes from JoesUpdate branch.
Added most of the missing attributes and flags types needed for metadata, and implemented an initial pass for parameter layout, however it seems to cause a problem with late bound locals resulting in having noticed missing locals during CFG building later
reverted unnecessary fix.
stumpwm deny raise request
stumpwm htop
[Update] AHShared (0.1.2)
Fixed Toolbox for repair

Toolbox is now needed for repairs.
added todo
Rcu: Added a randomized sequential test.
Log: Fixed an loop when dumping a log that wrapped around.
Debug symbols is now generated for all executables.
Map: Moved the rcu resize guard to the public function.

Avoids pointless extra calls to rcu when resize may not be called from
the public interface. eg. resize in a resize or insert triggers a
resie.
Merge pull request #311 from Rallaz/master

More patch to fix issue #252
save zoom views in a circular buffer, bug#3492302
Merge branch 'dli'
Revert "check the logic in INSTALLDIR"

This reverts commit 6fd62b5255d8251012202b89a8036154b5e7dd75.
Do not convert layer name to latin1
Merge branch 'master' of https://github.com/fitorec/LibreCAD
Merge branch 'master' of https://github.com/LibreCAD/LibreCAD
Implimented suport for custom MenuItem position and separators in ActionHandler
plugin.
Prevent creation of duplicate managed objects due to notifications from the MOC failing to be posted often enough. refs #661
added the webvtt.h changes from last pull
Coded the Error logging module
Deleted printErrorLog
Merge branch 'c-parser' of https://github.com/ShayanZafar/webvtt into c-parser
deleted printErrorLog redundant function
Resolving merge conflicts and adding declarations to webvtt.h
Update function updateServerData
CHARSET FIX
Update: Observer pattern used between LogicEngine class and Enemy class
Fixed: observer pattern source files
Update: Enemy alpha value added, used for fade in/out
Added: image drawing function with zoom and alpha, fade in on enemy spawn
Added: first draft for Tower and GraphicObject classes
Update: levelUp method for tower class
Try to fix a crash who happen sometimes in movielist
Fix crash when the user do a service scan with "skin developer mode" enabled
Fix crash in service info when no suitable codec is found
Fix possible crash when old settings will be cleaned in "bouquets and channels" panel
New spinner from Daconi
Merge remote branch 'origin/master' into azbox
LIBRARY

My library, download and use with my projects (Not a problem)
Client
======
- Fixed WorldType to allow custom WorldTypes in world creation GUI.
- Deprecated client WorldType.getSeaLevel() and renamed it with the more accurate name of getMinimumSpawnHeight.
- Changed related reference WorldProvider.

Server
======
- Fixed WorldType to allow custom WorldTypes
- Added methods to WorldType giving it the exact abilities of client WorldType
- Adjusted WorldProvider so that it relies on WorldType the same way it does on client.
add producer + test and RequestTypes
Revert and re-create some temporary pages lost
Adding chmod to archetypes
Added Selection and Projection classes
Merge pull request #1 from zhelgadis/select_modeling

Added Selection and Projection classes
Merge branch 'devel' of github.com:bards/Epic.NET into devel
added OrderCriterionBaseQA.cs
Add VS110 support.

Signed-off-by: Chglove <chglove@live.cn>
Typo change tab to whitspace.

Signed-off-by: Chglove <chglove@live.cn>
SEARCH : cancellata la funzione javascript Load .. inutilizzata . Gabriele gay .
Cast params to arrays to prevent fatal error in case of empty params in config
Fix for state sync issue in JS client.
eclipse artifacts deleted
this shouldn't crash anymore, and safely handle when it's wrong, fixes #106
Revert to test issue with Ender
Add alias for creating branches and tracking.
Removing Doctrine ToMany field -- not needed
new save format
move specs around
Sanitized parsing and started to implement SNP detection.
Add alsa_sound and mm-audio projects to CM for 8960.

Change-Id: If796396d21c586c14e24d5c15302a231aa901487
Update buildbot url

It was linked to buildbot.teamdouche.net, linked it to
jenkins.cyanogenmod.com instead.

Change-Id: I2a49dc99c0ef29871b8f0dfd0023a9871dfbf02b
Get Exchange from the CM repos

Change-Id: I552a0fb5bb879f8284a447c2364971f35c0c2544
Merge "Update buildbot url" into ics
Initial manifest for Jelly Bean

 * Does not include CM specific projects yet.

Change-Id: I4d8269b41b663736d9336e042c4ca14a775c4440
Add CM projects to JellyBean

Change-Id: I74be038f5b6c3bff13b4ce2be225fbcdcf7d2ddd
Add some CM apps

Change-Id: I198bbde372f1452d9603dfefb5385f14a9ce308a
Fix typo

Change-Id: I2bdd2a212a4d20196f4eda2b8712c8bef2089434
Putting the manifest in the manifest, dawg.

 * Also external/lzo

Change-Id: I8cd15dd5e405cd6080bd3e54b29c298d979f2717
Add QCOM display stuffs

Change-Id: Id9cbca37185574804e99fc5ef51f423f0d8a06e7
Remove Samsung devices since they have cm.mk support now

Change-Id: I63511b3aaba18ca6730e905be9f24c2dd2d36535
Add CM hardware module(s)

Change-Id: Ide93d4c36824fd9ce7182ac939731057d542fe95
Add su repository

Change-Id: Ib5c686e73c319fd735760b717a906b97acc7c4ea
Fix typo in su repository

Fix for b33dfde0ec2afe1a41052d05f7f330ffc06be123

Change-Id: Icad299e333530eeae2b4e420310fd010691b4026
Add QCOM audio

Change-Id: I1383e44e74b5477f0a993ea78ba0991ecc2dbf11
Add theme engine dependencies to CM10

Change-Id: Iadf18798819a0f593027a8e573cb6d81413af54a
manifest: fetch Trebuchet

Change-Id: I0498b29936eaacc34d7b0f02d5dc77e1f8990816
Add qrngd for HW random support on QCOM

Change-Id: Iad2375d1c48e193dce30f36a1e5e1911d85a8641
update

Change-Id: Ica109cf39a698e1f08a72f8522604b6c3e0d1a7b
add ti repo

Change-Id: I992a42f6be72b83e6693dd863084e6e404ad9ef1
js分析
fully compiles and works!

Still only works with triangles
Added fixed position to menu in super wide layout
Removed FileManager
Add i777 repo's

android_device_samsung_i777
android_device_samsung_galaxys2-common
android_kernel_samsung_smdk4210
Removed .notes
Start/Stop Fix
That aspect is gone

Fixes #79
Site updated at 2012-05-29 11:36:50 UTC
Dictionary of arguments for greater flexibility.
Initial nickserv support.
Merge branch 'master' of github.com:Thynix/RelayBot
add Change-Log
add some animations at the bookshelfviewcontroller
README updated, please read it, and use https://github.com/Torlus/qemu/tree/rpi instead
fixed myx fix
No error 2
Fixes
-Issue where a player could jump through a platform

Bugs
-No obvious ones that i can see at the moment (touch wood)
Fixes
-Issue where a player could jump through a platform

Bugs
-Still need to fix the issue where the player appears to bounce off the blocks horizontally
Merge remote-tracking branch 'origin/master'
For some reason these needed committing
inicialmente colapsado
ordena por grado los grupos
Changed maven artifactId to ngwmn to align with public url
fix radars.xml catalog (2)
unit tests
improve CFprofileWriter
Merge remote-tracking branch 'origin/target-4.3.10' into target-4.3.10
Playing with the update interval and created a new icon
x-www-urlencoded body building. Untestes
Debug validators.
Export scripts added
Updated install schema for search.
If Registration enabled, show Register link

This will only show the Registration link if Registration is enabled.
Add Brazilian language translation
Merge pull request #1750 from LeonardoCaitano/2.2/develop

Add Brazilian language translation
Merge pull request #1748 from donaldallen/2.2/develop

If Registration enabled, show Register link in Widget
Merge branch '2.2/develop' of https://github.com/pyrocms/pyrocms into 2.2/develop
Add line to have vim as default editor for SVN
Add line to search for tags file properly
on comment tag for form auth
disable comment tag for form auth
edit index.html
Merge branch '0.0.0.1' of github.com:WaspAce/Manager into 0.0.0.1
test edit
Require abstract controller no longer neede
BO ES faceted search fix
Fixed close button on help modal
Added tooltips to buttons setting initial map coordinates
Unified buttons class names
Added initial map coordinates configuration
Fix cursor on settings tab
Fix typo
Added app title setting
Load only needed scripts on upload page
Removed empty upload page - replaced with about:blank
Fix wrong upload result check
Added owner arms configuration to settings
Fix iframe styles
Boundingbox edit
Not in the right place xD
Added .gitignore
Added 1.1 version
Update --GAMEFILES/test.txt
WebServer: switch to html5 (WIP), use html5shiv
fix unitialized variables
Get rid of an unneeded var by using MAKEINTRESOURCE directly
float
update ffmpeg (n0.8-17258-g1be8d0f)
apply astyle
mplayerc.rc2: sort the shaders by name again
CONTRIBUTING.md: add the link to astyle's website and minor formatting fixes
Readme.md: reindent the table's code since it's easier to maintain, make the table's headers use bold and link directly to COPYING.txt and trac
Readme.md: add more links for the supported things
break long lines
move the ResStr define in DSUtil.h instead of duplicating it
Replace ZeroMemory() with SecureZeroMemory().  The MSDN article for ZeroMemory says: "To avoid any undesired effects of optimizing compilers, use the SecureZeroMemory function."
switch back to MAX_PATH
Updated Little CMS to v2.4 (git e4624c8)
Updated German translation.
project files: use MFCProj in the keyword when using MFC
ResizableLib and TreePropSheet: convert tabs to spaces
update TreePropSheet from TortoiseSVN
update .gitignore
fix more cppcheck warnings
update ffmpeg (n0.8-14143-g4c5a9fd)
update ffmpeg (75cd9a6)
FIX: album and thereby the filemanager object is created without existing context
[Relooking] Promise.js: Same API, more direct implementation, hopefully both easier to read and faster to execute.
fixed section length issue
Saved Payments - started
cleaned up code
moved option reseting code to a method
added rpc options spec
change var name of js + change according to dir name change

URL -> ROOT_URL
deleted default phpcloud page
Ajaxによる取得に切り替え
ツアー登録フォーム修正

・ポスト前にエラーチェック追加
・スポットのドラッグ不具合修正
grid and ui cleanup/refactoring
Initial commit
Merge https://github.com/aapokiiso/Skibb
check floating behavior
Changed certain paths
adding rm to git
Move rpmsignplugin logging to notice level. Closes #77 references #69.
fix url generation for searches
Merge branch 'master' of github.com:abutcher/juicer
delete file x
demo
Merge branch 'master' of https://github.com/achoudhary/kwiz
Populating questions
actually add forms.py
Send to all members
Resume packet downloads working
Merge https://github.com/acozzette/cs147
Added new data files and images
Merge branch 'master' of https://github.com/syclops/cs147
Update descriptor test after #4116
Change version for 1.0.10 release
merge from 1.0
Merge branch 'cassandra-1.1' into trunk
remove [Freeable]Memory finalizers
patch by Marcus Eriksson; reviewed by jbellis for CASSANDRA-4222
Merge branch 'cassandra-1.1' into trunk
fix BootstrapTest for #4203
Merge branch 'trunk' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge branch 'p/4122/02_remove_tokens' into refs/top-bases/p/4125/01_admin_tools
Merge commit 'refs/top-bases/p/4125/01_admin_tools' into p/4125/01_admin_tools
align for load of format ###.##
change column header from "+" to "-"; bikeshed color from red to blue
Add missing String.format call to log string contents
patch by Julien Lambert reviewed by dbrosius for CASSANDRA-4574
merge from 1.0
parallelize row cache loading
patch by jbellis; reviewed by vijay for CASSANDRA-4282
fix toString of hint destination tokens
patch by brandonwilliams; reviewed by jbellis for CASSANDRA-4568
merge from 1.0
merge from 1.1
fix merge
Merge commit 'refs/top-bases/p/4443/010_refactor_range_move' into p/4443/010_refactor_range_move
Merge commit 'refs/top-bases/p/4443/020_calculate_pending' into p/4443/020_calculate_pending
Merge commit 'refs/top-bases/p/4443/030_relocate_token' into p/4443/030_relocate_token
Merge commit 'refs/top-bases/p/4443/040_tests' into p/4443/040_tests
remove vestiges of STREAM stage, take 2
patch by jbellis; reviewed by yukim for CASSANDRA-4764
make nodetool accept -ve tokens 
patch by Vijay; reviewed by slebresne for CASSANDRA-4808
support custom sstable components
patch by Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-4049
fix BulkLoader NPE caused by #4732
patch by jbellis; reviewed by yukim for CASSANDRA-4846
Revert "support custom sstable components"

This reverts commit 5eb9e1c1576edb90f5b6e2ef975686e87a8c93af.
improve tracing output, moving less-useful debug messages to trace and adding others as needed
omit session, event id, and thread from trace output
fix event_id ordering and remove happened_at
cleanup unused imports
Fix CompositeType.{get/from}String methods

patch by slebresne; reviewed by jbellis for CASSANDRA-4842
Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/db/marshal/AbstractCompositeType.java
Fix build
initialize column iteration lazily so filter will be ready when it's first used
patch by slebresne and Piotr Kołaczkowski; reviewed by jbellis for CASSANDRA-4816
merge from 1.1
fix merge
mv cqlshrc example out of bin
Merge branch 'cassandra-1.1' into trunk
Add ssl support to cqlsh.
Patch by Aleksey Yeschenko, reviewed by brandonwilliams for
CASSANDRA-4610
include range bounds in debug logging of range and index scans
make trace output pretty
patch by Aleksey Yeschenko; reviewed by jbellis for CASSANDRA-4852
fix Streaming test
Merge commit 'refs/top-bases/p/4443/010_refactor_range_move' into p/4443/010_refactor_range_move
Merge commit 'refs/top-bases/p/4443/020_calculate_pending' into p/4443/020_calculate_pending
Merge commit 'refs/top-bases/p/4443/030_relocate_token' into p/4443/030_relocate_token
Merge commit 'refs/top-bases/p/4443/040_tests' into p/4443/040_tests
Merge commit 'refs/top-bases/p/4443/050_process_queued_xfers' into p/4443/050_process_queued_xfers
Improve initial datagrid work
Update README with method_missing support
CApplication and Gfx::CEngine interfaces & other

- added CApplication and Gfx::CEngine interfaces
- added Gfx::Material struct
- added Math::IntPoint struct
- added template for Gfx::CDevice class
- added templates for Gfx::CGLDevice and Gfx::CGLEngine classes
- Refactored requestAnimFrame.
- No longer need xIsEpochDate, so removed.
CenterModal
published v1.16
Remove nginx.vim from local
Add nginx.vim
Detect nginx file
stripped down unnesseccary bindings
changed video to kazakstan video
110312:1900
translator added
astcssp.shared.js -> src/cssp.ast.shared.js
Fix: latent unicode error.

気づいたところをユニコード文字列にした
Fix: bitbucket.update can't show current priority (always major)
Refactor: sort config values
Fix: error when no comments.
Fix: if someone uses pipes, output width are fixed with 80 and avoid an error.
Update: add available ticket field priority.
Fix: error if ticket don't have commentnum.
Fix: always use utf-8 encoding text when send it to a editor.
Add: redmine.py for redmine service(not completely implemented yet)
Start av tester

Problemer med å laste opp data i det hele tatt.
application.conf lagt til gitignore
Test-sider til gitignore
its beautifull
updates
add gitignore
Multistage deploy
[0.8.0-beta.1+build.2] +Fix Changed /nethome entries in workflows to /home
update gems
Version bump to 0.3.1
Added text colour functions.
More print_summary_statistics refactoring
Copy-edited README
超帅的独松关
帅个屁，天启鄙夷地说道~
跳出card_intention编写中的一个误区
独松关模式
关于自称……伤不起啊- -
自称“人家”的女生，基本上啥工作都不用做，有男生会替你做掉大半；
自称“偶”或“藕”的，至少能省去一半的工作；
自称“我”或“俺”的，全部工作都是自己的；
自称“姐”或“爷”的，连男人的活都是你的；
自称“老娘”的，得，连牲口的活都给干了。
大家想想认识的女生对她自己是什么称呼。。。
日月弓竟然能杀四人？我勒个去！
法国最终小组第二出线，四分之一决赛面对欧洲杯和世界杯双料冠军西班牙。然而法国队占据着明显的心理优势。双方历史上共交手8次，其中正式比赛法国3胜1平保持不败。另一有趣的数据是，自从1996年欧洲杯扩军为16队参赛以来， 卫冕冠军的路都不好走。
【趣文摘】
1.工资就像大姨妈，一个月一次，一周左右就没了。
2.晚上不要讲鬼故事，因为人爱听，鬼也爱听。
3.我眼本明，因你而瞎!
4. 看别人不顺眼，是自己修养不够。
5.一个受过教育的笨蛋是多么可怕的笨蛋啊!
6.发情的你和绝情的我怎样面对这个滥情的世界。
7.你别总是带着一脸便秘似的郁闷!
魯提轄の圖
will refactoring
Enumattr::Enum to inner class of Enumattr::Enums
remove Enumattr::Enum
remove Enumattr::Enum
add base attribute to Enumattr::Enums

    enums = Enumattr::Enums.new(base_class, &block)
    enums.base #=> base_class

to get using enum_attr_for context class
change class method apis
refactoring method definitions
add setter by key
fix README examples
add :on option
fix #enumattr_name_key when out of range value
replace __send__ to send
add :enums option alt block style declare
Merge pull request #410 from marekmurawski/patch-1

Accepted. Will change separator before site name to '|' though.
Changing separator before site title to '|'.
Fix issue with Behavior class name

As reported in the forum, http://www.wolfcms.org/forum/topic2050.html,
the behavior class is instantiated with it's id instead of the
camel_case name, which is confusing because it is applied to the
'PageHack'.
Allowing for title to be set by Controller. Fixes issue 407.
Merge pull request #412 from andrewmman/master

Fix issue with Behavior class name
updated wolfcms
Fixed #19176 -- Typo in copy-pasted error message.

Thanks maxirobaina for the report.
Fixed a DeprecationWarning under Python 3.
Fixed #6527 -- Provided repeatable content access

in HttpResponses instantiated with iterators.
Fixed #13222 -- Made HttpResponse iterable once

response.content can be accessed many times as desired, and always
returns the same result.

iter(response) works only once and consumes the iterator.
Removed a function that is already fully implemented by a base class.
Fixed #9471 - Expanded ModelAdmin.raw_id_fields docs; thanks adroffne for the suggestion.
Remove a case that is no longer reachable in encodings.py.

This case was originally designed to handle Exception's which didn't gracefully support coercing themselves to unicode. However, because it lives in the `else` case of `if hasattr(s, '__unicode__'):` we can be sure it's no longer reachable in djanog anymore, because since Python 2.5 exception has subclassed object, which means Exception objects always have an __unicode__ method.
Fixed #18796 -- Refactored conversion to bytes in HttpResponse

Thanks mrmachine for the review.
Fixed #19102 -- Fixed fast-path delete for modified SELECT clause cases

There was a bug introduced in #18676 which caused fast-path deletes
implemented as "DELETE WHERE pk IN <subquery>" to fail if the SELECT
clause contained additional stuff (for example extra() and annotate()).

Thanks to Trac alias pressureman for spotting this regression.
Added docstring to DeleteQuery.delete_qs()
Fixed #19187 -- Raise consistent error from qs.values().delete()
New version.
Add new files
libwinpr-synch: initial commit
winpr/tools/hash: added NTLM hashing tool
libwinpr-utils: started SAM utils
winpr: fix WCHAR, define -fshort-wchar
libwinpr-sspi: improve SAM management
libwinpr-registry: start implementation
libwinpr-registry: reduce API stubs to MinWin
libwinpr-registry: add support for reading simple values from a .reg file
libwinpr-sspi: fix compilation on Windows
libwinpr-sspi: improve native SSPI build
libwinpr-sspi: added support for Service Principal Name (SPN)
libwinpr-sspi: partially fix encoding of credentials on Windows
libwinpr-sspi: fix authentication with native SSPI modules
libwinpr-sspi: fix WinPR NTLM SSPI module
wfreerdp-server: initial commit
wfreerdp-server: fix connection sequence
wfreerdp-server: cleanup names
wfreerdp-server: fix server-side TLS on Windows
Merge pull request #628 from alama/master

fixed up compiling FreeRDP with -Werror
libwinpr-sspi: fix uninitialized variable warning
Changed ROICalculation to calculate for a given timespan
Added proper calling of roi calculations
Added some comments, some refactorings
Merge branch 'master' into roiCalc
Some refactorings, calculations now uses FeedInTariffProvider
Fixed broken unit tests, some bugfixing and refactorings
Change $_rules from PRIVATE to PROTECTED to allow the access of this property if you extend CUrlManager.
Site com mais textos e videos. Closes #15
Map actions in ToolbarAccess controller
Merge branch 'integration' of github.com:ning/killbill into integration
update to AccountDao to provide transactional support for fetches; minor cleanup in EntitlementSqlDao
Merge branch 'integration' of github.com:ning/killbill into integration
Merge branch 'integration' of github.com:ning/killbill into integration
- remove InternationalPrice from billing events; pass values and currency instead
- constrain target date for invoices to a configurable number of months in the future
Implement fix for billing event ordering
- add invoice number (auto_increment field that is only set when the invoice is created)
- changed custom field value to not required
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java
	entitlement/src/main/java/com/ning/billing/entitlement/engine/dao/EntitlementSqlDao.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultBillingEvent.java
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultEntitlementBillingApi.java
	invoice/src/test/java/com/ning/billing/invoice/TestInvoiceDispatcher.java
	invoice/src/test/java/com/ning/billing/invoice/dao/InvoiceDaoTests.java
	invoice/src/test/java/com/ning/billing/invoice/tests/DefaultInvoiceGeneratorTests.java
re-enable payment retry test
Implement total ordering for SubscriptionTransition -> fix for demo using IM
- disable testRetries
- use Clock in payment tests
- add some debugging messages to payment mocks
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	entitlement/src/main/java/com/ning/billing/entitlement/api/billing/DefaultBillingEvent.java
Fix entitlement tests after last chnage for total ordering
removing createdDate from invoiceItem constructors
Merge branch 'integration' of github.com:ning/killbill into integration

Conflicts:
	entitlement/src/test/java/com/ning/billing/entitlement/api/billing/TestDefaultBillingEvent.java
added groups to beatrix tests
[maven-release-plugin] prepare release killbill-0.1.7
[maven-release-plugin] prepare for next development iteration
Fix borken requestedDate
Minor test change in comparing payments
Use thread_callWithStackShell() in thread_suspendHandler().
html doctype fix
No point keeping commented out webrat code
Update support links to new URLs

/help is now /support
Fix typo guide format name.

The first letter should be lower case,  it was upper.

@author Seema
@author Rob
Corrected minor change in changelog.md
update: google2.php
session event handler
Added copypaste code for PentawallNet device
Добавил стили для выбора региона
Merge remote-tracking branch 'origin/master'
small tweaks
* changed the title
* small styling
* others
Add links to distro packages
Fix havok material version check.
Merge pull request #10 from amorilia/feature/fo3_havok_material_fix

Fix havok material version check.
Pooja/Aasawaree: Date Labels rotated
Disabled FOVFinder debug output in debug mode
Added indication of secret rooms on map in debug mode
starting to write wrapper for FITPACK's sphere.f
Update Zhuyin database with upstream data

McBopomofo commit cdf18b0b0d067e3aa43eac42cf6991011af5ed33
Merge pull request #1272 from timdream/jszhuyin

Update Zhuyin database with upstream data
Add an option to get_content to retrieve data as raw json data
wire/template: default loop var to 'item'
Изменил связь пользователя с кадровиками  (многие ко многим)
Изменил связь пользователя с кадровиками  (многие ко многим)
Fix different metrics, product between blades now works as expected
1204191148
1205052253
updated with janus (https://github.com/carlhuda/janus)
(1) Fix SLLS_MAJOR and SLLS_MINOR;
(2) Add TRACE0 support.  TRACE0 is denoted very important logger,
which is correct logger, not error and fatal.
Safe Chages
module DOCUMANTATION for apt, apt_respository cleanup
Merge pull request #1133 from jpmens/doc-apt-fix

module DOCUMENTATION for apt, apt_respository cleanup
Workaround for when HP iLO is in a state it won't accept requests

This workaround is recommended from HP iLO's documentation, but may not be sufficient in all cases. Time will tell.

I also made a few cosmetic changes with no impact.
Merge pull request #1268 from dagwieers/hpilo-reboot-fix

Workaround for when HP iLO is in a state it won't accept requests
Fixed the bug so that isCondidential field displayed on viewGentoype
page. 
When removing an allele from a passport which already had genotyping
results associated with it (sample_genotype records), it asks the user
to select an alternative allele. If an alternative allele is
selected, move the samples to the alternative allele if they are not
already on it. 
-Fixed viewCage mating bug -> new litter was not being added to the
mating
Merge pull request #9 from eshang/LIMS-1227-Remove-Allele-With-Genotyping-Results

[LIMS-1227] Remove Allele with Genotyping Results
Merge pull request #24 from anthonycho/LIMS-899_new_litter_matings_bug

-Fixed viewCage mating bug -> new litter was not being added to the
Merge pull request #22 from eshang/LIMS-1130-Refactor-Mouseline-Backing-Code

LIMS-1130] Refactor Mouseline Backing Code [Bug Fix]
Persist state of running jobs on Jenkins.reload().

This is an attempt to fix [JENKINS-3265]. During reload (only), Jenkins
will persist the state of running jobs and restore them afterwards. This
does change a few low-level assumptions about whether or not a
non-completed job has a build.xml file present.
Merge branch 'master' of https://github.com/jenkinsci/jenkins
Rebuild ui/jq.ui.js and ui/jq.ui.min.js from @ledil pull
adding the base action controller and removing the startup container as it is no longer needed, replaced by the DIContainer
MAPREDUCE-4703. Add the ability to start the MiniMRClientCluster using the configurations used before it is being stopped. (ahmed.radwan via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419619 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4130. BKJM: The reading for editlog at NN starting using bkjm is not efficient. Contributed by Han Xiao.




git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419661 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4291. edit log unit tests leave stray test_edit_log_file around. Contributed by Colin Patrick McCabe.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419664 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4292. Sanity check not correct in RemoteBlockReader2.newBlockReader. Contributed by Binglin Chang.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419676 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-6762. Exception while doing RPC I/O closes channel. Contributed by Sam Rash and Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419783 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9126. FormatZK and ZKFC startup can fail due to zkclient connection establishment delay. Contributed by Rakesh R and Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419832 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4295. Using port 1023 should be valid when starting Secure DataNode. Contributed by Stephen Chu.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419855 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4294. Backwards compatibility is not maintained for TestVolumeId. Contributed by Ivan A. Veselovsky and Robert Parker.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419877 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2264. NamenodeProtocol has the wrong value for clientPrincipal in KerberosInfo annotation. Contributed by Aaron T. Myers.


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1419951 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1420232 FIXES: YARN-266. RM and JHS Web UIs are blank because AppsBlock is not escaping string properly. Contributed by Ravi Prakash


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420233 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4861. Cleanup: Remove unused mapreduce.security.token.DelegationTokenRenewal. (kkambatl via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420350 13f79535-47bb-0310-9956-ffa450edef68
MAPREDUCE-4549. Distributed cache conflicts breaks backwards compatability. (Robert Evans via tucu)

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420363 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-9113. o.a.h.fs.TestDelegationTokenRenewer is failing intermittently. Contributed by Karthik Kambatla


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1420495 13f79535-47bb-0310-9956-ffa450edef68
Merge branch 'branch-2'
svn merge -c 1398288 from trunk for HDFS-4037. Rename the getReplication() method in BlockCollection to getBlockReplication().

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398289 13f79535-47bb-0310-9956-ffa450edef68
svn merge -c 1398293 from trunk for HDFS-4036. Remove "throw UnresolvedLinkException" from FSDirectory.unprotectedAddFile(..).

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398294 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8901. GZip and Snappy support may not work without unversioned libraries. Contributed by Colin Patrick McCabe.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398417 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4049. Fix hflush performance regression due to nagling delays. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398590 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3678. Edit log files are never being purged from 2NN. Contributed by Aaron T. Myers.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398604 13f79535-47bb-0310-9956-ffa450edef68
HDFS-2946. HA: Put a cap on the number of completed edits files retained by the NN. Contributed by Aaron T. Myers.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398608 13f79535-47bb-0310-9956-ffa450edef68
HDFS-4058. DirectoryScanner may fail with IOOB if the directory scanning threads return out of volume order. Contributed by Eli Collins

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398617 13f79535-47bb-0310-9956-ffa450edef68
HADOOP-8929. Add toString, other improvements for SampleQuantiles. Contributed by Todd Lipcon.

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398659 13f79535-47bb-0310-9956-ffa450edef68
HDFS-3985. Add timeouts to TestMulitipleNNDataBlockScanner. Contributed by Todd Lipcon

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-2@1398875 13f79535-47bb-0310-9956-ffa450edef68
added gemspec and introduced executable.
moved gitdia.rb to lib folder.
Use requestAnimationFrame to remove replacement flicker
Testing delete_internal
sdd

dsd
More cleanup in ArenaActor
Merge branch 'master' of https://github.com/artagesw/FROIDZ
临时增加权限类型处理，后续需优化代码
Particle in-line rendering
New line at the end of file
New line at the end of file
Renderer object wrapping rendering process
Constructor execution controller workaround fixed to a more comprehensive and safe method
Piece renderer implemented
Halo renderer
ボタンによる非同期読込(初期読み込み時は何もしない)
Fixed bug in throttle
aint nobody got time for dat
Use BSD stream api
Add sigpipe
Move to latest GLGeom
Update the contact link to point at a wiki page. #9
Update the github links to the current URL style.
Use SSL for opensearch links since we redirect to that anyway.
get working with 1.9.3; bump version
Changed info.lua format, and rewrote file loading

info.lua has a new changed format, with a lot less cruft.
Instead of a global MODULE table, you now just return your shit,
All the variables in info.lua tables are now lowercase.
Also sh_module.lua now is a lot less retarded, and uses the new file API
(I also changed every modules info.lua files to be compatible with the new
shit)
better UA client
enable to set architecture type to build rpm.
add architecture type to directory path.
add architecture type to raw filename.
add prelink to spec file to avoid to be crashed ruby binaries.
set "BRCOMPAT=yes" after installing openvswitch.
fix tgt init-script path.
set kernel parameters for openvz.
check whether /etc/sysconfig/openvswitch exists or not.
add architecture type to vendor_dir path.
add basearch param to detect i*86 architecture type.
add rpmbuild/set-openvswitch-conf.sh to local installer.
fix to set i*86 architecture type.
add rpmbuild.sh to build rpm in clean installed environment.
fix to delete basearch from repos.d path.
update epel version. (6-6 -> 6.7)
add "parted" to build vmapp to spec file.
remove epel version number.
change base_distro_arch default value.
enable to use after-script.
remove unused mount targets.
making a bridged veth-device persistent
add openvz template dir
Reintegrate the intelligent pet patch (v0.1.2)
Reader: allow recordOffset to span several chunks
Reader: handle multiple LZMA streams in a single chunk
Improve ZinniaSoftKeyBoard Project ---Branch

1.
Copy the org.zinnia package from ZinniaAndroid to ZinniaSoftKeyboard.
Remove old routes and add devise and seeds
the element ui's are loaded only once and accessible via an element property
Various changes.
todo: drop upstart
Revert "Various changes."

This reverts commit da35e814efb2bc867d34bd85bf0bb6a732bc36ff.
delete editbook and addbook xhtmls
combine old addbook and editbook in common.xhtml
css make up a little
add op parameter for add and edit links
add op parameter for add and edit links
add authorconverter for selectonemenu element
modifications for adding author to book bean
modifications for adding author to database. add author_collection
override equals for authorConverter
Added presentation #5 (events and delegates). Plus minor changes.
Initial commit of Exceptions Demo
Added section on shape-space and affinity landscape from chapters I-III
of Brownlee2007.
Added entries for missing references (only code and title). Still need
to add complete data.
Expanded chapters I and II from Bronwlee2002. Added an image.
Added Makefile. Corrected some references.
Added package that inserts bookmarks on the PDF file.
Added tcc.tex to the Makefile prerequisites.
Changed all 'h' float placements to 'h!'.
Moved table from AIS chapter to introduction.
Fixed more references (11).
Sorted recent applications table by number of papers.
Fixed non-ASCII characters on code listings.
Merge branch 'master' of https://github.com/bbguimaraes/tcc

Conflicts:
	Makefile
new Dancing Links solver (much faster)
Add color getter
Make it possible to pass elem to colorjoe
Expose change and end events via "on" method
disable cgroups memory management
added custom.css installation for Chrome and Safari on OS X
EML test and view improvements
Small changes to EML and test
small changes to get eml export working
Added files for eml version 2.1.0
Added automatic loadInfo checking, conditionalized some log messages
input: Add js: true to bemhtml
Add Appirator 0.0.3 podspec
adding domReady requirement handler
Add test for present, but invalid _id property
Fix memory engine for new tests
Always return to normal color after a rainbow bit.
fix header parsing . fix by DeadZen on irc
metagen()'s interface has changed; errors fixed
Added suitable/basic rsync user --excludes (like .cache) and added remote 'module listing' to rsync.test.
Typo: missing ending ,
Fix: Corrected mount point for files.
Added perl test modules (pod, podcoverage, and perl critic)
Fix a missing ','
added disjoint set and priority queue. added a graph. displaying graph edges
just banner <1> to <2>
evloving to a real P2P arch
Merge branch 'master' of github.com:bfeng/myTorrent
Move rhn_satellite issue 3 HTTPS logic to set_rhn_connection_options, added all other RhnSatellite class HTTPS settings
Added additional knife rhn system commands.
Added knife rhn systemgroup commands
Updated README documentation for all the new goodies.
Updating to work with requirejs-rails. There are still some outstanding issues where I'd like tests to fail more aggressively in response to module loading failures. I've marked affected code with TODOs and sent a message off to the requirejs mailing list.
slider add description
Add unit tests for set key type of SerializerPackageImpl
Seq: port from Std to Internal_pervasives (#31)
Transcripts: switch to Internal_pervasives (#34)
ajout mode d'emploi
war
settings
m2e
Merge branch 'master' of https://github.com/bischofc/docweb
simplify CDBEnv::Open() / fix small glitches

- remove pathEnv from CDBEnv, as this attribute is not needed
- change path parameter in ::Open() to a reference
- make nDbCache variable an unsigned integer
- remove a missplaced ";" behin ::IsMock()
Merge pull request #1997 from Diapolo/bdb_open

simplify CDBEnv::Open() / fix small glitches
revs plugins para admin logout
bench: add http_simple_auto benchmark

Starts a server and benchmarks it with ab.
bench: run GC and dump stats if --expose-gc is set
Remove old commented out code in Data.RangeSet
Remove deprecated use of Data.ByteString.hPutStrLn
Tidy up the .cabal file
Start on a test suite

- Generic set of QuickCheck2 properties for
  Data.BooleanAlgebra.BooleanAlgebra instances

- Test Data.RangeSet implementation with some QuickCheck2
  properties

- Move commented out property in Data.RangeSet into the actual
  test suite
Remove useless 'import .. hiding'
Some updates to Data.DFA

- Add a 'runFiniteStateAcceptor' function so that finite state
  acceptors may be executed without necessarily converting them
  to DFAs. This is intended to be used for testing.

- Add an instance of FiniteStateAcceptor for Data.DFA.DFA
Name the test of Data.RangeSet after the module name
Start of an attempt to test the generation of DFAs from regular expressions
fixed: when debug logging is off, make sure the arguments to LogDebug aren't processed
xhtml
x
x
x
新装了一个插件 powerline ，注释掉了 tagbar 插件
Show a users games on their profile page

+ user_detail view and template - Show games the user is a
  player in and games they are a moderator in.
+ user_redirect view - Redirect users to their own page

Signed-off-by: Sam Clements <sam@borntyping.co.uk>
Filtro dos Relationship por usuário
attendee bios
Splitting out misc utils into seperate module
Switching to record based current connection stats
New take on orange shifts
Fixes
Add data_space_map_per_cluster
Read maps
included faye token file
added a fixed template variable containing the current template
directory path
Merge pull request #58 from brickoo/dev

added a fixed template variable containing the current template
auto-add/remove marker, auto-create token, smart-marker
- auto-add marker added, with support for +1/+1 and -1/-1 marker annihilation rule
- auto-remove marker added
- auto-reate token added
- NOTE: If multiple marker/token types are included in the tag, these functions will add ALL of them!

Smart Marker support added:
- a new autoscript tag action, .smartmarker[markertype] will set that marker to a global variable
- The "Add Smart Marker" function (ctrl+shift+S on a card) will add one marker of whatever is currently set to the variable
- Useful shortcut for cards which put markers on other cards.

Increased OCTGN version to 3.0.1.0
Increased game version to 3.0.5
Merge branch 'master' of git@github.com:brine/mtg-octgn.git
(hopefully) fixed #1
Destroying a token involved in card attachment breaks alignment and attach functions
ld, kontrola podataka za F18
added exclude filter for plugins for messages generated by enbot
basics of jiraplugin done
minor changes
Modified logging to allow for a showLevel option to be passed. When false, the level prepend is not included in the log statement.
Added galah.web.api __init__ to repo.
Moved galah.db.helpers.pretty into galah.base.
Moved galah.db.crypto into galah.base.
Adding colorscheme
Removed includeSubDomains since they're not all SSL
Require the deploy key before git clone
core!
Added Git Ignore
Development Log
NOBUG updated extra plugin list
Updated application settings to include the experiment module
Added new Exceptions and JavaDoc'd some methods
Fixed logic to be more positive, I have not tested this yet, will do so ASAP once my plan lands :)
Stubbed isCableConnected while I am flying to Sacramento! :) Obviously there are no ethernet cables up here. Moved exceptions to their own package. Updated .gitignore. Added the ManagedSystemInterface class
Add missing ClassRegistry import.

Fixes #2757
Fixing failing test case in RssHelper
Avoiding problems with relative paths in shell dispatcher
Merge remote-tracking branch 'cakephp/2.3' into 3.0

Conflicts:
	lib/Cake/Console/ConsoleErrorHandler.php
	lib/Cake/Console/Shell.php
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Controller/Component/Acl/IniAcl.php
	lib/Cake/Controller/Component/EmailComponent.php
	lib/Cake/Controller/Component/SecurityComponent.php
	lib/Cake/Controller/Controller.php
	lib/Cake/Core/App.php
	lib/Cake/Core/Configure.php
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/I18n/I18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Model/Datasource/Session.php
	lib/Cake/Network/Request.php
	lib/Cake/Routing/Router.php
	lib/Cake/Test/Case/Core/AppTest.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/RouterTest.php
	lib/Cake/Test/TestApp/View/Layouts/flash.ctp
	lib/Cake/Test/TestCase/Cache/Engine/MemcacheEngineTest.php
	lib/Cake/Test/TestCase/Console/Command/Task/ExtractTaskTest.php
	lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
	lib/Cake/Test/TestCase/Utility/TimeTest.php
	lib/Cake/Test/TestCase/View/Helper/FormHelperTest.php
	lib/Cake/TestSuite/TestSuiteCommand.php
	lib/Cake/Utility/Number.php
	lib/Cake/Utility/Time.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/View.php
	lib/Cake/basics.php
	lib/Cake/bootstrap.php
Merge branch '3.0' of github.com:cakephp/cakephp into 3.0

Conflicts:
	lib/Cake/I18n/I18n.php
	lib/Cake/Network/Request.php
	lib/Cake/Test/TestCase/Cache/Engine/MemcacheEngineTest.php
	lib/Cake/Test/TestCase/Controller/Component/PaginatorComponentTest.php
	lib/Cake/basics.php
	lib/Cake/bootstrap.php
Update version number to 2.1.2
Fix overwriting of GET/POST

ControllerTestCase was overwriting GET and POST and not
restoring them at the end of testAction.

Fixes #2841
Add no-op method to base class.

Fixes #2839
Fix issue with non-sequential array keys.

Xml::fromArray() should not cause errors with non-sequential
numeric array keys.

Fixes #2580
Update assertions.

Use assertXmlStringEqualsXmlString() it gives
better error reporting.  Also update string concat
into heredocs.
Merge branch '2.1' into 2.2

Conflicts:
	lib/Cake/Model/Datasource/DataSource.php
	lib/Cake/VERSION.txt
skipping the rijndael test if mcrypt_encrypt() is not available
Merge pull request #849 from dogmatic69/rijndael-fatal-error

skipping the rijndael test if mcrypt_encrypt() is not available
feature- and bugfix release

- fixed wrong manifest order of uses-sdk
- optimized home_layout to be not bigger as needed
- fix warnings in state_row.xml
- added strings to whole app to be able to translate it
- make home_menu use strings
- added logging and quit option to menu
- make CpuSpyApp use a SparseArray which is faster
- fix wrong override of onCreate (didnt call super)
- add generated serializationId to exception so compiler is happy.
- move logging to separate class to make it optional
- add xhdpi icon which is an 2x sized hdpi icon scaled with a
nearestneighbour filter in Paint.NET
- added german translation
forgot this version marker
Create 333

dsffdfdfd
Using indeterminate attribute for checkboxes instead of ugly css and images
Merge branch 'tristate' of github.com:pgiraud/cgxp into tristate
Removing image and css as well
Merge pull request #249 from pgiraud/tristate

Tristate
default projectionCodes is the map projection code + fixed out-of-range coords bad processing
update property API doc
Merge pull request #84 from camptocamp/fts_defaultproj

Default projectionCodes is the map projection code
removed padding top from header
change work_change.txt
tidy; rm archive content
Pass bing3.key if given on ant's command line.
Added stop words, punctuation detection and POS-based stop word
tagging. A lot of potential problems though -- how to integrate
resource reloading, how to integrate it smoothly with the default
pipeline without potential conflicts with other lucene versions
(in case of solr embedding for example), etc.
Added an example of clustering local XML files.
Improved core file
Add iqe-join script to join meshes.

Adds dummy weights for all non-skinned meshes if one of the
meshes is skinned.
Add in node_modules required by server.js

This is apparently a best practice (for apps):

  http://www.mikealrogers.com/posts/nodemodules-in-git.html

Seems weird to me.