labofsahil/github-event-dataset-2012 huggingface dataset:
Fix: Reset password count not going into statsd

As @jystewart guessed, Devise needed to be configured to use
our override controller.
Fix broken password reset controller tests

Until recently, this code was never actually running. It appears
that wiring it up broke some functionality.

Further to that, the duplicated Devise code didn't match. I
decided to avoid copying code entirely, and instead use a before_filter.
Start give/take command and inventory destroy
14-11-2012-3:05PM
-----------------------------------
	COMMIT LOG
-----------------------------------
fcl-db: postgresql: do not clear result of PQexec if result set is returned (PGRES_TUPLES_OK) + test
simplify error handling

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23138 3ad0048d-3df7-0310-abae-a5850022a9f2
Use new getdirentriesi49 syscall, contributed by Pascal Stumpf

git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@23223 3ad0048d-3df7-0310-abae-a5850022a9f2
rxvt-unicode_7.9.bb : Fix LD_LIBRARY_PATH so tic finds a library. From bug #2807.
last delete+
...
Merge branch 'master' of github.com:amedse/wordsmith-test
merge with alternate versions
merge with remote
Modified switches, and rpms_bid bug fix
Shell script fix to account for the switch modification
Node script deployable on Heroku for Server IP exchange
Android files using Heroku Script
Merge Conflicts Resolved
small fixes to clean up code in submission logic
Rename "p" to "espilon".
Allow regression losses for classification.
Add epsilon-insensitive loss.
predict_proba with loss="modified_huber".
Update doc.
Doc: predict_proba.
What's new.
Document API change.
Easier to understand formula.
COSMIT: only classes should have capitals
ENH: make LinearSVC copyiable

Fixes #820
TST: do not raise warnings in sklearn.test()

This fixes #834
BUG: fix testing on older numpy
WEB Added page with links to various tutorials/presentations on scikit-learn
DOC added some explanation to video page
DOC: cosmits on tutorials and videos
DOC: wording of whats_new
ENH added random_state to Gaussian Process
BUG: use permutation rather than shuffle
FIX testing: random state problem in forest testing.
CSPACE-5133: Updated partial term search query to include all terms' displayName instead of just preferred display name.
Merge branch 'CSPACE-5133'
CSPACE-5059 Re-enabled creation of missing shortId values from (term)displayNames for the simple create by auto-complete in the UI. Fixed a minor bug with the expected element name in list results.
Merge branch 'CSPACE-5059'
CSPACE-5137,CSPACE-5167: On create and update requests, service validator handlers now check whether a termDisplayName is included with each term in the request payload, rather than checking for either a termDisplayName or a termName.
CSPACE-5133: Adding mock additional display names to list result for partial term searches.  Do this so we can test full-stack integration of term completion with P/NP terms.

Signed-off-by: Richard Millet <remillet@berkeley.edu>
Merge branch 'CSPACE-5133'
CSPACE-5133: Fixed compilation problem with common list item return type -now items are an entry in HashMap<String, Object> not HashMap<String, String>.
CSPACE-5122: Add commonNameSourceDetail field to services taxon schemas
Merge pull request #24 from rjaffe/master

CSPACE-5122: Add commonNameSourceDetail field to services taxon schemas
CSPACE-5133: Final changes for partial term queries that can return multiple display names in list results.
Merge branch 'CSPACE-5133-A'
Merge branch 'master' of git://github.com/collectionspace/services into CSPACE-5128
opp4xxx_data.c + dpll44xx.c: Rework of all Frequencies
Kernel Version: ak.044.jb.exp - Rework of all Frequencies
opp4xxx_data.c: Fix GPU frequency
cyanogenmod_tuna_defconfig: Disable MSDOS
cyanogenmod_tuna_defconfig: Disable some HID devices
board-tuna.c: Undervolt vaux3=2900000, tuna_vusim=2000000
board-tuna-wifi.c: Undervolt tuna_vwlan=180000
clockdomains44xx_data.c: [IVAHD] Disable HWSUP mode and save power
omap_twl.c: Undervolt omap4_iva_pmic:ret_volt=800000, omap443x_core_pmic:ret_volt=800000
omap_twl.c: Core OFF Volt set to 0
OMAP4: PM: fix overconsumption on OFF mode

The wrong value of CM_L3INIT_CLKSTCTRL.CLKTRCTRL = 2 (SW_WKUP)
has been stored in SAR during omap4_sar_save() execution and
causes power over consumption on OFF mode due to C2C operation.
It happens because the L3INIT CD need to be enabled during
omap4_sar_save() execution for proper USBHOST module context storing.

Problematic use case:
1) OMAP goes to sleep,
2) modem wakeup the C2C, the EMIF but the MPU is still sleeping
(as expected)
3) Modem release all his constraints, C2C is turned to OFF.
4) but OMAP never reach again OFF while we don't wakeup the CPU
(by a keypress for example), sys_clk is already ON and voltages
are not equal to 0. (OPP 50 for CORE_3 and retention voltages
for both VCORE1 and VCORE2).

As WA overwrite CM_L3INIT_CLKSTCTRL.CLKTRCTRL = 0x1 (SW_SLEEP).

Change-Id: I2e453c07f61bab28a7213dd66044fd41a021961b
Signed-off-by: Arthur Cassegrain <a-cassegrain@ti.com>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>

Patch Set 1
Kernel Version: ak.015.jb.exp
tf_comm.c: Fix warning: 'error' may be used uninitialized in this function
Revert "board-tuna-wifi.c: Undervolt tuna_vwlan=180000"

This reverts commit b51fd8385d473c6cc335e0039159f03bee606fa4.
usb: musb: musb_core.h: drop __deprecated flag
MessageThread
Conflict B3.
fixed conflict.
Merge branch 'master' of git@github.com:andreiolaru-ro/testme.git
Correção no formulario de entrada por nota
change b-img bemhtml
ISPN-2289 Report number of active local and global server connections
ISPN-2289 Fix server JMX unregistration when server stopped

* Also fixed a bunch of test to avoid leaking cache managers and make
sure they don't end up with random NPEs.
ISPN-2368 Two rebalances in parallel

The "is rebalance in progress" check was effectively outside the
synchronized block.
ISPN-2365: Prevent txs with no modifications from being replicated to a remote site.
JBQA-6819 - The properties are added to coverage profile surefire plugin, so that the state transfer is done properly without timeouts.
JBQA-6819 - The inherited tag is removed for propagating the configuration to child projects. The combine.self attribute is added for overwriting the argline configuration from top surefire config.
JBQA-6819 - The inherited tag is removed for propagating the configuration to child projects. The combine.self attribute is added for overwriting the argline configuration from top surefire config.
JBQA-6819 - The inherited tag is removed for propagating the configuration to child projects. The combine.self attribute is added for overwriting the argline configuration from top surefire config.
JBQA-6819 - The inherited tag is removed for propagating the configuration to child projects. The combine.self attribute is added for overwriting the argline configuration from top surefire config.
JBQA-6819 - The inherited tag is removed for propagating the configuration to child projects. The combine.self attribute is added for overwriting the argline configuration from top surefire config.
Basic fixed charge DONE
Store exporter script
Store list exported on 4/23
AS7-4664: upgrade PicketLink to v2.1.0.Final
got rid of the message sending.
修正了一个如果连续字符串的一个调用栈太深的一个bug
- Added giant result table.
All results except all features updated (on Dan's end)
updated the fixed and suggestion regexes to include ones surrounded in *'s and |'s
modules url updated
wrap documentation to max of 100 characters
Tackled C compile warnings
Being able to compile StackTracy native extension on Windows ^^
Pand 2
Skript - Thunderkompatibilitaet wiederhergestellt
Skript - technisches Update
Skript - Erste Version
Screenshot -Floating Scrollbar
Floating Scrollbar - README
Skript - Erste Version
Screenshot - Simple Session Manager
Simple Session Manager - README
lunch
Merge branch 'master' of https://github.com/arjgk/shooting-spider
Added ctest command.
Added ability to change model name.
changed name of tests to have context
Changing test names to be context driven
Adding tests for BasicAccountInformation
Wrapping send method in tests, refactoring, and simplifying
deleting uneeded .h files
adding more comments to Send method
Removing silly magic strings with sweet constants
Adding tests for Request Method, refactoring, refactoring Test file structure
Added file to hole the constants
Adding tests for Balance, refactored
Removing getJSONBalance method
Added method for creating Query Strings from Dictionaries
Testing and Refactoring Contacts, Nearby and GetContacts
Fixed MD5 sum.
Maven version retriving fix
Optional autopublish of feature added to start command
Fix BASE resolving in feature start command
Add feature start -P option to usage
Merge pull request #3 from artemkirillov/develop

Tuned regexp for maven project version retrieving
merge from griddynamics
Merge pull request #4 from estepanova/develop

Add facility to feature branch publishing after creation.
Changed egrep to grep for version retrieving
add gnuplot gem and placeholder ruby for generating stats graphs
updated table: it now also stores URL
setup.py and initial package structure
connect to libfreeimage.so
basic file operations
test and fixloading/saving
Add alpha-auth gem dependencies to base role and chef recipes to vendor
Added admin controller (still blank). refactoring course page header WIP.
Resolved merge conflicts.
Removed depricated files
Resolved merge problems II
Keyword end failure solved.
Finished course page makeover
Added grid to terms index
Added .cache files top to .gitignore
First pass through messages.js.

Mostly stylistic refactoring. Starting the process of renaming 'properties' to
'fields'.

I'm going to try for another pass tomorrow evening too.
new udt socket options
Heading font-sizes now set in ems instead of rems, closes #8
Revisited image loading
schreck-lass-nach moment, started with coverage
Correcao das mensagens de boas vindas
Merge branch 'master' of github.com:bbarros/ERP-Palmeiras
instruction d'installation des dépendances à Flask, Jinja2 et Werkzeug
rhts
Renamed rhts-wizard to beaker-wizard
beaker-wizard: chmod scripts only when necessary [BZ#709753]
beaker-wizard: updated links
beaker-wizard: Description may not contain colons [BZ#722413]
beaker-wizard: Use instead of in the templates
Update the beaker-wizard to work with Git
Added consistent identifier for bugs but test name remains the same
BeakerLib has moved (long time ago) to /usr/share
beaker-wizard: Do not replace existing files with attachments [BZ#797244]
beaker-wizard: Update valid releases [BZ#828338]
beaker-wizard: Abort when environment is not ready [BZ#838575]
moved beaker-wizard from rhts-devel
Replaced a outdated specific description with an ambigous one.
Merge branch 'dev' into dev-upload
Fix composer installation instructions
Merge pull request #9 from aderuwe/patch-2

Fix composer installation instructions
use handlebars_wax
Better Alignment
add datebox with server side custom parser
Implemented improved maps and sets

Signed-off-by: berger killer <bergerkiller@gmail.com>
Set status.showUntrackedFiles to no in .gitconfig.
be more precise about ML lion version
폰트관련 수정
New class to stack or sum histograms
Add a complete list of valid tags and attributes according to HTML5
Fix #15, profile pictures are cached for stats views
event help
update help event
Update src/jquery_ui_ember.js

Added some comments
format_errors should be html_safe
Improve render page title
Add link betwen Page and User
auto install requirement when installing
remove textmate project file
add some helpe methods into assets_finder_spec.rb
for assets_finder_spec.rb: stub method assets_path
for assets_finder_spec.rb: add rspec example for path string manipulation
for assets_finder_spec.rb: example for #retrieve_app_assets
for assets_finder_spec.rb: more detailed examples for retrieve_app_assets method
for assets_finder_spec.rb: examples for retrive_[vendor|app]_assets
for assets_finder_spec.rb: example for retrieve_assets
reconstruct AssetsFinder#controller_assets
reconstruct AssetsFinder#action_assets
reconstruct AssetsFinder#retrieve_app_assets
implement AssetsFinder#retrieve_lib_assets and #retrieve_vendor_assets
realize AsstesFinder#meta_retrieve, a method used to handle almost all the assets retrival
implement AssetsFinder#retrieve_app_assets
implement app_path
refactor AssetsFinder#absolutely_pathize
new test fixtures
stop keeping track of *.tmproj files: it is a very noisy repo things, too much unrelevant messages
Moving Align plugin into bundle
COMMAAAAAA
add/edit categories
modified:   PythonServer/main.py
	modified:   PythonServer/static/js/punchgame.js
Add new partners link
Make the bell less annoying

A visual bell ringing for any alert ever was getting annoying. This
makes it more quiet.
Added support for fetching places.
Added support to import_tiger to use fuse-zip, instead of extracting the zip file. This turns out to be quicker, as there is less disk IO.
Changed the DB format. Instead of having both land and water area, we now have a single area (as 99% of the time we need only land area).
Also we now store all the metadata that originally comes with the dataset.
More aggresively free resources.
Basic styling.  Ready to do some test deployments to see that fb integration works.
adding ghw: option to gitconfig
Core Debug修正
Database类库更新
opendebugger控制器更新
house cleaning, removing unnecessary pics
Added vimux bindings.
first steps to enhance the setup process of the gpodder provider
add init script for use by rhel-ish platforms
Got AJAX for add song working
shorter return statement for files model
fix socket service argument issue
change require to wp core fct
update css for custom style via customizer
use parent functions
add validation for link_color
add custom callback function for background color and merge with custom colors
[RJA-1340][fix] action renaming
Set slide BG with inline styling
edited view to fixed choice appearing when change question type
update underscore.string to 2.3.x
added "FiniteMapping", a dictionary-like class that can use arbitrary keys instead of just strings
some changes to attitude.c and gyro.c
hasLayout fixes for IE mobile bus bullet icons overlapping for narrow screens
fix for obanyc-1240  duplicate vehicle ids were messing up batching of
inferredlocation_map, so refactored to store only last update per
vehicle per batch
Merge branch 'master' of github.com:camsys/onebusaway-nyc
use new holiday code field
changed to README.org to force github parsing it
Copy in in-source mozconfigs
change name
Merge branch 'master' of git://github.com/mozilla-releng/buildbotcustom into mozconfigs
get full path from config.py
do nightly builders too
fixes
Merge branch 'master' of git://github.com/mozilla-releng/buildbotcustom into mozconfigs

Conflicts:
	misc.py
	process/factory.py
Get rid of mozconfigsInTree
Merge branch 'master' of git://github.com/mozilla-releng/buildbotcustom into mozconfigs

Conflicts:
	process/factory.py
Use RetryingShellCommand for mozconfigs step
resolve TODOs
fixup bad merges
Merge branch 'master' of git://github.com/mozilla-releng/buildbotcustom into mozconfigs
Set MOZ_UPDATE_CHANNEL in our environment if update_channel and
create_snippet are set.
set MOZ_UPDATE_CHANNEL in better places
fixes
copy environment so we don't screw up other folks!
disconnect harder!
Merge branch 'master' of git://github.com/mozilla-releng/buildbotcustom into mozconfigs

Conflicts:
	process/release.py
Merge branch 'mozconfigs' into disconnectharder
connecting the subject object
cleaning up change history files - removing older specifications for the RDF mapping.  Only the last one is used, so previous ones can be removed to unclutter the change history as these aren't actually applied to the data.
Picker now resizes itself when (void)reloadData is called
Merge pull request #7 from adamcoulombe/master

Resizable picker
Added redis support
Updated file to work with Redis
Implemented get intermediate nodes function. Added validation for new leaf form fields. Made MHT generation automatic when leafs are created, modified, or destroyed.
Exclude arguments for packaging
bundle file added
IN PROGRESS - issue SKWORKSHOP-6: As a shopper I want to select an
installment plan for credit card payment, so that the whole debt will be
easier to pay. 
http://redk.it/browse/SKWORKSHOP-6

Display payment plan
Made Method Cut, and made test class
fix #1450: TB not visible (related to special characters)
make unit-test output looking more convenient
Now reading and writing from the file.
upgraded trinkets now use upgraded proc ep values, remove old proc calculation for performance, change to 5.1, add woundripper_medallion
movie -> film
put emacs in the centre of the display
write a stack for path in lock-free btree
Insercion de css en las paginas de perfil, registro y usuarios
Add myself as one of the authors
Add Cheffile and Vagrantfile for testing
Added "unoffical" plugin

Sample script that can be configured to give visual and audible alerts
based on watchdog1337 output.

Not polished and won't run out of the box.

Settings.cfg now contains a "plugin ready" customcmd sample command
styling, favorites list, cleanup, post-its
Updated the Changes dependency and made some tests a little more robust.
Extracted the self host code out into its own library and began using that NuGet.
readers digest version update
Handle API change in upcoming Sass releases.
Fix broken test cases.
Change hide-text back to the -9999 method. Leave the Kellum method as an option by setting $hide-text-direction: right
Versioning is hard.
PODCAST-10: Still one test failing
#620 - don't create new HourlyCharge instances to probe the charge schedule in variable rates; reduce logging
Merge git://github.com/m0hamed/e-cidadania

Conflicts:
	src/e_cidadania/views.py
Merge branch 'master' of git://github.com/cidadania/e-cidadania
more fixes around move to uuids

Change-Id: I61839e9e2b780bf03eb1e2ecb594e30249c7be2c
Add Chef-apt-repo and write recipe for install Node.JS

Chef-apt-repo is needed to be able to add repo through ppa
Import existing project files and update README
Import password file example
install linkit_views to enable link to people view
Fix KitchenSink URL
Fix copy-paste bug in -sendDidUpdateMessageIfWarranted

* Doh!
* also use that method to DRY up -triggerDeviceUpdate
comments, NSLogs, pragmas
Ultimos mini cambios
Add mock#fs existsSync and writeFile.
Commit wsp file
Added style and content to main page
Added a PokemonFactory to build Pokemon
Removed file loading from Pokemon and Delegate files. This logic now only exists in the PokemonFactory
clearfied the code

- Read exactly bytes we should.
- Use self.rfile / self.wfile install of mixed.
- Do not make the band port specified.
add Python version requirement in README.md
add troubleshooting
replace send with sendall
Merge branch 'temp' into dev
add version
add gevent
use sendall()
implement send_all myself
fix infinite loop bug
add TCP_NODELAY
rollback
merge from dev
Added comments to the LineTest class.
Minor fixes
first take into this module
Presentation change
Presentation change
Improved UML and code description
Merge remote-tracking branch 'Berreman4x4/master' into dev
change .gitignore
FTIR description
New examples
Compiles on MSVC 2010, 32 bit
CSS and JS corrections
through chaper 7
Simple misspelling update
Dont overwrite KeyBinding.Callback from disk, its not saved
Interim fix for latency issues on Windows and Linux browsers.
1) Submit camera -- fixed
Yet more images plus some extras.
Slettet unødvendige filer.
Cleaned up gemfile.
Merge branch 'master' of github.com:comike011/place-corgi
Fixup issue mail render problem.
replace two version history items that fell out
- remove spec noise
+ consolidate sinatra extensions
- simplify namespace module
- remove announcement step
- remove announcement step for rack
+ tidy up includes
- simplify the models to POROs pending reworking
- remove unused dm type for money
- strip out old stuff from the readme
+ add collection helper
+ remove old gem dependencies and update others
Revert "working on fonts without ToUnicode"

move it into devv

This reverts commit 86578b4c674aae4cd11d810a26dd85f78e4ca723.
Adding game completion detection and notification.
Bringing up Gmap Snippet
cleanup
ignore generated files
Updated dark noise image.
fix print rekap data
Merge branch 'master' of github.com:crewpuk/Lulu-delivery
Exported 'Quantum Rebase' to an HTML file for CSS testing.
Modified typography. Adjusted sizes, margins, etc. to coincide with a modular scale based off of the golden ration. Also made some presentational changes to the <strong> tags.
Cleaning up unneeded HTML file.
Merge pull request #1 from zachlebar/zelebar-typography

Zelebar typography
added submodule
moded css dir
Merge branch 'master' into gh-pages
Automated page build by crgwbr
correction for plasma desktop on openSUSE 12.1
Improve feed so it only shows entries containing a picture
0.3.0 Development Release.  See CHANGELOG for details.
initial commit of customised version of PHPExcel library with work done by Josh
Merge branch 'master' of github.com:csdsesystems/phpexcel
put some mildly useful info on the readme
Fixed link to email
implemented skeleton server config in README.md

Change-Id: Ibc4fcd414f80f1f22cc86c30772c5b032c23ed87
Signed-off-by: Christian Siewert <siewert.christian@ymail.com>
Use first part of key, if no scope is specified in I18n.t with :scope
Fix: if translation is blank, return humanized key
Cleanup
Remove unused module
Release 1.1.0
[maven-release-plugin] prepare release v1.1.0
Compare millis. Closes #440
adding ability to list jobs from admin, few other little fixes
sentence structure
removed css
no make sure that TravisTranscript.txt file gets put in a spot .travis.yml can find it
Updated changelog about issue #14 being fixed
responsible for more than the "featured channel"
Added default page setup.
boston-stitch g option lets you select a gallery
fix the model generator
Add docs controller to replace action filter
case insensative controller name
unnecessary function
rename factories to adapters
merge master,
remove unused code
remove unused code
remove swagger controller
remove swagger controller file and swaggerActionFilter
add link
remove querystringbug controllers
Patched some bugs regarding permissions
remove old method
Version Update
Patched some Bugs in pagecomments and rating
Icon for Rating Closing Issue #20
Set Version
History now knows logins
Permissions
Pages now inherit permissions from PAGES_WRITE on creating
Removing Text from buttons
Fixing Issue #21

If you go to another page out of Preview you will be pushed to this page
Fixing Issue #24 - Disabling FieldSets and DropDowns
Patched Bug in DataObject with can-methods

Now the given record is always a object, so you don't have to check on
array or object!
Revert commit before, and add Fixes from commit before, because second commit which was coliding

Now the given record is always a object, so you don't have to check on
array or object!
Fixing Bug #25 - Unload fired too much
Fixed Bug with scrolling
Improved Tree

- Automatically open active subnodes in tree
- correct scrolling
Resolving Issue #27

Version-Number and Build-Number are now compared seperatly
Application-Upgrade implemented, Issue: #22

- Upgrade-Scripts for applications
- version.php holds current version
- implementation in backup-scripts to exclude version.php from GFS
Upgrade-Script is now in ClassInfo and Some Patches in Installation with SoftwareType
Updated .gitignore
Updated .gitignore + UpgradeScript for Goma CMS
Added mysite/.htaccess
LeftAndMain-Bug fixed that Rootnode not selected sometimes
Added asyncronous ObjectStore, halfway there.
Merge branch 'refactor_handlers' of github.com:danielsmith-eu/webbox into refactor_handlers
RVP.passedTest done
As discussed earlier, the Conceptual Model was wrong in considering testResult a User Procedure. It's now RVP.passedTest, as it needs a probability distribution function
Added comments for UPs
We'll need to update the conceptual model at a later time to reflect some of the changes we're making
Comments for RVP's
Note the difference in passedTest(). The conceptual model will need to be updated.
merge in changes from upstream
Fix invalid method call for strip_trailing_seperator in configuration
Revert "fix Issue 4854 - Regression(2.047, Mac 10.5 only) writefln Segmentation fault if no globals"

This reverts commit 73cf2c150665cb17d9365a6e3d6cf144d76312d6.

Conflicts:

	src/core/thread.d : kept Walter's changes but only if OsxManualTls.
      maybe should remove those completely as they aren't needed for
      druntime-ldc.
Created ValidateEmptyString for use in Visual validation.
Added better validation support and other updates to StandardVisual.
Created "required" feature on VisualBuilder.
Updated LivePage to use jQuery182 module instead of injecting a script.
Created RedirectResource to allow easy redirection to another page.
Updated Service to require the methods be public for endpoints.
Contents of web from commit a9fcb973
- Fixing the manifest
- Improved tinyChat UI
- Added jQuery-min libs for UI and core
- Excluded tinyChat files from the website itself
hooking app to Heroku MongoDB instance
Added a search feature
Got rid of good 'ol Solr
Deleted unnecessary search view and partial for
Deleted the last of those buggers
Successfully refactored the search feature
Got rid of the unnecessary search attribute in attr_accessible
removed unecessary tests
Removed search action in books controller
Merge pull request #4 from davidberko/search-feature

Added a search feature
Update js/bootstrap-tab.js

started
- added:google hosted jwplayer js file
- fixed : little bug on goodnewes page
Cope with CSVs with different character encodings to the usual ASCII/UTF-8.
Facebook module in configuration file
fix authorization bugs
Do not show error if not configured.
Parallel ProgrammingChanged codeproject section once again
updated links between users
building index mobile changes
Homework 1 (DNA)
removing cbust
Merge pull request #674 from VictorLowther/pull-req-master-6bf3ea3c2a

Kill mlocate abd updatedb for real this time [2/5]
Merge branch 'master' into hadoop-os-build
Add updated submodule references for master
Merge branch 'master' into hadoop-os-build
Merge pull request #681 from cloudedge/pull-req-hadoop-os-build-cdb5ff52fa

Fix defects for Alias timing issue [5/5]
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Merge pull request #1498 from galthaus/pull-req-master-c1236b1253

Fix crowbar install for redhat on crowbar 2.0 [2/5]
Merge branch 'master' into cloudera-os-build
Merge remote-tracking branch 'origin/release/rails3anddb/cloudera-os-build' into release/rails3anddb/cloudera-os-build
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Add updated submodule references for release/rails3anddb/master
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Merge pull request #1503 from cdearborn/pull-req-release-rails3anddb-master-235eed257c

Network CRUD API [2/5]
Merge pull request #1504 from cdearborn/pull-req-release-rails3anddb-cloudera-os-build-3f6e22e62c

Network CRUD API [3/5]
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Add updated submodule references for release/rails3anddb/master
Merge pull request #1507 from clement-jim/pull-req-release-rails3anddb-master-3f5746aa7c

1st stage of authentication done.  Users required to login, can logout, default user crowbar/crowbar created at sys init." [2/2]
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Add updated submodule references for release/rails3anddb/master
Merge branch 'release/rails3anddb/master' into release/rails3anddb/cloudera-os-build
Merge pull request #1508 from cdearborn/pull-req-release-rails3anddb-master-aa6909bc6a

Network CRUD API [3/6]
Merge pull request #1509 from cdearborn/pull-req-release-rails3anddb-cloudera-os-build-66aab01424

Network CRUD API [4/6]
Merge remote-tracking branch 'origin/release/rails3anddb/cloudera-os-build' into release/rails3anddb/cloudera-os-build
Eschew barclamp merge conflicts.
Eschew barclamp merge conflicts.
Add tour de montreal pdf

Really have to work out a better way of doing binary files like this
Add ability to read grayscale images
Update app/code/local/Cofi/Coficalc/Block/Coficalc.php

Remove key and vendor code
Failing Router test
Allow optional :id param for post to model endpoints.
Bump to 2.3.1
Merge branch 'v2.3'
Fixed caret file saving issue
Update to targa 6.7.233 blobs
update LICENSE file with contributors [ci skip]
Improvement to C++ coding

* Use forward declare of class instead of #include in header files
* Add library prefix when #include Qt class
* Use foreach or Java-style iterator instead of indexing when looping
over QList
* Use m_* naming for private members
change for oxid 4.5.x, so the template must not be changed for 4.5 or 4.6
Codificação de caracteres e dados de acesso ao banco de dados
Merge branch 'master' of github.com:diogocavilha/Agendaki
Split locale js code
added rvmrc
added autotest
made bundle use http iso https rubygems
add Session object
implement show and form
add created_at and updated_at
added presenters
Merge branch 'master' of github.com:rwestgeest/propile
added dates in show window
fixed view specs with dates
fill up views for presenter
add a few colors to experiment with css
add presenter email addresses to session
add presenter email addresses to session in new.html
added automagic presenter creation on session - first errorprone implmentation
Merge branch 'master' of github.com:rwestgeest/propile
add form_new
play with formatting
added deployment scripts
updated apache conf
* Issue #9 "Array could not be too deep" fixed
* Issue #8 "No tab charactes should be accepted inside a string"
* Tab indetions in spirit.cpp
fixed community in header, was not centered before
Fixes for 1.8.7
Update META.yml for 0.75 release.
Update to version 0.75
Add git annotation similar to svk annotation.
Move CHANGES file into root for search.cpan.org.

rt 67541
Update CHANGES.
Bump to version 13 of the database (rt 67543).
Reflect moved CHANGES file.
Add top level version subroutine.

Requested by H.Merijn Brand.
Add DEVEL_COVER_DB_FORMAT environment variable.

Set to either Storable or JSON to control the DB format.
Add advisory locking to database IO operations.
Explain what to do if regexp_eval.t ever fails again
Remove leftovers from PERL_OBJECT
5.8.7 is crashing with forks and evals.

Skip the tests and recommend 5.8.8 and above.
Merge branch 'master' of http://github.com/rafl/Devel--Cover
Update RELEASE document.
Add changes for 0.76 release.
Update to version 0.76
Merge branch 'RT44906-Win32-make' of https://github.com/dolmen/Devel-Cover-perl
Fix gcov to work with C and XS files in subdirs.
Use Build script when it exists, not just Build.PL.
Starting to configure apps
Linux 3.4.13

Original patch from http://www.kernel.org/pub/linux/kernel/v3.0/incr/
more updates on cross-correlation plots
Test
Merge branch 'master' of github.com:dtsunekawa/tritonyelp

Conflicts:
	Gemfile
Translated fr_TN on Fuego using Weblate.
Merge remote-tracking branch 'origin/weblate' into weblate
improve ws server
Added message count
Forcing users to create a question
Merge branch 'master' of https://github.com/dustincoates/datester
logo
hghghMerge branch 'master' of https://github.com/dustincoates/meetster
onError()の処理で終了していなかった不具合を修正
initial of wifi connector
Merge branch 'master' of github.com:ebmajor/wifiConnector
Beam shows with line
jetty-9 eased scheduler test
Separate id locale view for dashboard show page.
Upgrade to rails 3.2.8 and fix sharing devise login across subdomains.
Revert "OMAP: mcspi: Perform NULL pointer check before accessing cd->swap_datalines"

This reverts commit 2cc5be6efa45d14d9c385726f5de8cbdc88efb66.
Add interfaces for TokenDef
fixes and refactoring + RoutingData.globalizeHelpers()
new settings and initial paypal
Omgjord
use @rpath instead of @executable_path
Update ivy-example/common/common.xml
The TimeSlot object with the toString
cleaned default settings
aktueller STand
data und docs verzeichnis dazu
aktueller stand vor github-push, und jinja2-lib
Implemented code generation for subclasses implicit constructors.
blblblblb with damien I hate git
Merge pull request #1 from Ducasse/master

sample for pier syntax
replace interactive-p with called-interactively-p macro
tested compatible with GNU Emacs v 22.x - 24.x
Merge pull request #328 from rolandwalker/byte-compiler-2

Fix: new 'yas--called-interactively-p' to shoosh byte-compiler
reorder defuns to quieten byte-compiler
Two warnings avoided:
function `yas-define-snippets' defined multiple times in this file
the function `yas-define-snippets' is not known to be defined
Minor: cleanup internal doc headings slightly
Merge remote-tracking branch 'rolandwalker/byte-compiler-3'

Fix: reorder defuns to quieten byte-compiler

Conflicts:
	yasnippet.el
Minor: make 'yas--define-snippets-1' an internal defun
Doc: added notice about bug reporting
Doc: update "reporting bugs" section in README
필요없는 파일 삭제.
Substituindo payed por paid
Tirando o sufixo Id
script de exportacao
cleanup the hc registration handling a bit
Updated/added translations
[AS7-4841] Set up periodic pings between master and slave HCs; properly handle disconnections detected by them

split up applying extensions from the rest of the model

fix ping/pong mgmt headers

don't sync deployment files if they exist
AS7-4841 Tighten up executor service handling
AS7-4841 Use remoting threads only for ping/pong handling
AS7-4841 Don't bother unregistering if the channel is already closed
dedicate a single thread to the HC registrations
Fixed bug ENCUESTAME-484
Fixed distance_to_object
Texture fix
Wrote texture_set_alpha_from_texture properly
Fixed sprite drawing using current instance image_index
Fixed debug errors
Fixed replacing texture indexes
Pulls newest JDI to correct macro issues
Fixes file_text_write_real bug
Added image_number
Set get_border correctly (again)
Fix d3d_set_hidden
Added file_size, file_access_time and file_modified_time for windows.
They could maybe be cross-platform as I used POSIX C headers. If that is
the case then someone move it to the Universal_Systems.
Merge branch 'master' of https://github.com/enigma-dev/enigma-dev
Pulls newest JDI in an attempt to fix 32-bit problems.
Merge branch 'master' of https://github.com/enigma-dev/enigma-dev
Fixes linker errors due to missing files from compileEGMf.cbp
Lexer written, no preprocessor directives yet.
Final merge from master before official fork.
just figured out how to load in graph
Updated version handling in docs and updated year.
Gonna move it back to my personal account.
Minor update to changelog.
Merge branch 'release/0.5' into develop
Whitespace fix
Updated for Lulu patch
Adding statistics retrieval
moved rainbow connection into db repos

to fix connections not releasing issue
Merge branch 'master' of https://github.com/ericdc1/whatsforlunch

Conflicts:
	LunchApp/Lunch.Data/Repositories/JobLogRepository.cs
	LunchApp/Lunch.Data/Repositories/JobRepository.cs
	LunchApp/Lunch.Data/Repositories/RestaurantRepository.cs
	LunchApp/Lunch.Data/Repositories/RestaurantTypeRepository.cs
	LunchApp/Lunch.Data/Utilities.cs
fixed transition bug related to frame.timeDiff
Updated stuff. A lot.
Reorganized into module
Some pattern ideas/links, work in progress
test
test 6
Merge source folders
Edited the History section
Some improvements in crcmake.sh. Updated rubygems to 1.8.18.
Fix an error with Logging set to 'OFF' triggering a cast exception.
No more null errors from corrupt config.yml's.
iacc's anal
Merge branch 'groupmanager' of github.com:essentials/Essentials into 2.9
Add aliases for new thorns enchantment.
Updated installation instructions for 3.2

Fixes EUCA-4326
added cpp
more
Add some basic install info

Usual stuff, symlink to somewhere in your $PATH
Fleshing out layout and routes
adding cancellationSource attribute
Merge branch 'master' of github.com:eventick/pagseguro_v2
Initialize plugin in test code
Handles all cases except...

... selection completely overlapping html elements in the partial selected
content of a node that appears on either side of the selection, i.e.

<div> blah blah |start|blah <span>blah</span> blah</div><div>blah|end|</div>
First commit
Demo
hero viewer example - items
tweaked border
First stab at a homicide map
Fix syntax to match documented spec
Fix shader warnings for wood fragment shader
Implement basic physical ball material properties
Correct force calculation for balls
Fix physics engine stepping
Change level pack loader to match documented specification
Remove redundant comments
Implement seconds per frame and frames per second counters
Actually show FPS as well
Fix FPS counter
Abstract away the explicit handling of forces and simplify the force interface
Optimize effect render passes
Remove debug messages
Fix drawing order of particle systems when using illumination post-processing effects
Revamp pass system and add configurable parameters
Run automatic code cleanup
Move responsibility of centering the menu to the game engine
Finish the implementation of the dialog box
Add error handling for when levels are loaded
Make the menu hide itself instead of closing when pressing close
增加了提取峰值位置百分比，个数等特征程序，增加了python多项式拟合程序
增加了提取峰值位置百分比，个数等特征程序，增加了python多项式拟合程序
增加：使用python的scipy库进行kmeans和hierarchy聚类的3个py程序，以及对拟合、峰值等特征的聚类结果
Merge branch 'HEAD' of git@github.com:fabregas4fan/citation.git

Conflicts:
	readme
Removed SonataCacheBundle as it's no longer installed; various readability tweaks.
implements IDisposable
support synchronous in require implementation + special credits
More design tweaks.
/var/run/pgbouncer folder will be deleted when machine reboot, change to /var/pgsql/pgbouncer
fix bug related to save server info in the right section of server.ini
merge bugfix on section issue of joyent
Merge branch 'pgbouncer-bugfix' into develop
published flah
[maven-release-plugin] prepare release twelvemonkeys-3.0-finn-2
only use logging if there's a log folder in the current directory
update the postgresql database example
use rb-fsevent for watching file on mac
optimize the spec helper for spork
use guard for test unit only and without spork for now
修改俄罗斯方块 下落到底动作
Changes to classState map to use IEntityClass name as key now. Also debug logs sprayed around some methods for more visibility if required while debugging.
Merge branch 'master' of github.com:floodlight/floodlight
Rewrite of reclassify, made learnDeviceByEntity the only place where devices get created or updated (through re-allocation).
Made changes to test to incorpate change in classState map in device manager.
Merge into master from pull request #294:
merge for change to classState map definition and some debug logs (https://github.com/floodlight/floodlight/pull/294)
template index toegevoegd
added airos_core config alias
new buy URL
Prep for 1.2.5 release
Add REST service
Inject soap client
Rename rest client
Pushed latest revision 14327
prova twitter bootstrap
Clean up Makefile.

Approved by:	maintainer (on IRC)


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304693 aed309b6-a8cd-e111-996c-001c23d10e55
corresponding to ibus update
corresponding to ibus update
- Update to checkin da583db283

Changes:
  * bulk: Show which make.conf, PKGDIR and OPTIONS directory is
          being used for the build.
  * testport: Add -z SETNAME support
  * Support PTNAME-make.conf

Feature safe:	yes
Update from 1.2.2 to 1.2.3.

<ChangeLog>

*) Feature: the Clang compiler support.

*) Bugfix: extra listening sockets might be created.
   Thanks to Roman Odaisky.

*) Bugfix: nginx/Windows might hog CPU if a worker process failed to
   start.
   Thanks to Ricardo Villalobos Guevara.

*) Bugfix: the "proxy_pass_header", "fastcgi_pass_header",
   "scgi_pass_header", "uwsgi_pass_header", "proxy_hide_header",
   "fastcgi_hide_header", "scgi_hide_header", and "uwsgi_hide_header"
   directives might be inherited incorrectly.

*) Bugfix: trailing dot in a source value was not ignored if the "map"
   directive was used with the "hostnames" parameter.

*) Bugfix: incorrect location might be used to process a request if a
   URI was changed via a "rewrite" directive before an internal redirect
   to a named location.

</ChangeLog>
Mark BROKEN: does not build

Submitted by:	pointyhat
Mark BROKEN: does not build

Submitted by:	pointyhat
- Update to 6.33
Update to 0.36
Update to Wine 1.5.14.  This includes the following changes:
 - Much better behavior of the URL cache.
 - Improved GIF image support.
 - More parser features in the shader compiler.
 - Optimizations in JavaScript.
 - Various bug fixes.


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305017 aed309b6-a8cd-e111-996c-001c23d10e55
- Update to 4.6.0
- Add regression-test: for tinderbox

Changes:	https://github.com/parrot/parrot/blob/master/ChangeLog
- Cleanup Makefile header and define LICENSE knob(s)
- Set ALL_TARGET to ensure we're actually compiling stuff
- Stop wanting GNU make, it was needed just for bogus conditional that
  really does nothing and is removed as well
- Uphold CC value and reformat port description while I am here
- Remove BROKEN statement since it builds fine at least on two arches
  per what I see here

Tested on:	flame (sparc64) and pluto2 (ia64)
Nota bene:	new version, 1.83, is available at sf.net


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@305025 aed309b6-a8cd-e111-996c-001c23d10e55
- Apply new Makefile format
- Mark IGNORE for php_mapscripts [1]

Reported by:	Frank Broniewski <brfr@metrico.lu> [1] (via email)
> Description of fields to fill in above:                     76 columns --|
> PR:            If a GNATS PR is affected by the change.
> Submitted by:  If someone else sent in the change.
> Reviewed by:   If someone else reviewed your modification.
> Approved by:   If you needed approval for this commit.
> Obtained from: If the change is from a third party.
> MFC after:     N [day[s]|week[s]|month[s]].  Request a reminder email.
> Security:      Vulnerability reference (one per line) or description.
> Empty fields above will be automatically removed.

M    mapserver/Makefile


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304942 aed309b6-a8cd-e111-996c-001c23d10e55
- Remove redundant LICENSE_FILE

Reported by:	Ruslan Mahmatkhanov <cvs-src@yandex.ru>
Approved by:	crees, tabthorpe (mentors, implicit)
- Fix getting currency quotes from new yahoo API using upstream patch
- Bump PORTREVISION

PR:		ports/171207
Submitted by:	Guido Falsi <madpilot@FreeBSD.org>
Obtained from:	Upstream project repository
Approved by:	maintainer timeout
Approved by:	crees, tabthorpe (mentors, implicit)
In r302421 I forgot to remove the old entry for qbittorrent [1]

While I'm here, make the other old entries more consistent.

Reminded by:	Yuri <yuri@rawbw.com> [1]
Update PostgreSQL to 9.2.1, 9.1.6, 9.0.10, 8.4.14 and 8.3.21 respectively.

This update fixes critical issues for major versions 9.1 and 9.2, and
users running those versions should apply it as soon as possible.

URL:	http://www.postgresql.org/about/news/1416/
- Add additional MASTER_SITES entry
- Add LICENSE
- Other improvements
- Give maintainership to submitter

PR:		ports/171288
Submitted by:	nemysis <nemysis@gmx.ch>


git-svn-id: svn+ssh://svn.freebsd.org/ports/head@304106 aed309b6-a8cd-e111-996c-001c23d10e55
1) Made cake file do minification
masukon web console
mask of wmfs-live ebuild
changed buttons to input
Modified AndroidManifest.xml added SMS_READ permission
HHH-6043 PostLoad method invoked before collection initialised
HHH-6043 PostLoad method invoked before collection initialised
HHH-7644 Correct memory leak
HHH-6972 Support PostgreSQL and Oracle LOBs
HHH-4098 VARBINARY should be BLOB in DB2400Dialect
Merge branch 'master' into user-guide-reorg-ch8
moved old chapter 2 on managing pages to new ch 5 on web content management
added more content to 05-web-content-management chapter from old 03-web-content-management chapter
moved more content to 06-advanced-web-content-management from old user guide
moved workflow for wcm section into 05-web-content-management chapter
Merge branch 'master' into user-guide-reorg-ch5
Merge branch 'master' into user-guide-reorg-ch6
transferred appropriate material to the new 10-collaboration-suite.markdown chapter, removed material that belongs to other chapters (knowledge base, related assets, tags and categories, docs and media)
Merge branch 'user-guide-reorg-ch5' into user-guide-reorg-ch8
moved tags and categories section from old collaboration suite chapter to new 08-asset-framework-chapter; since there were two sections on tags and categories in the old user guide, there are now two in the new user-guide; both are in the 08-asset-framework; i'll meld them into a single section
moved old social networking chapter to new 11-social-networking.markdown chapter
moved old dynamic data lists chapter to new 12-web-forms-dynamic-data-lists chapter
Merge pull request #215 from jrao/user-guide-reorg-ch5

User guide reorg ch5
Merge pull request #216 from jrao/user-guide-reorg-ch8

User guide reorg ch8
Merge pull request #217 from jrao/user-guide-reorg-ch11

User guide reorg ch11
Merge pull request #218 from jrao/user-guide-reorg-ch12

User guide reorg ch12
Started Social section.
Merge branch 'master' into user-guide-reorg
moved old kaleo workflow section to new 13-using-workflow.markdown chapter except the workflow designer and workflow forms sections; these go in a separate new chapter
moved kaleo designer and kaleo forms to new 14-kaleo-forms.markdown chapter
little adjustment to the indicator lines
fix su cache e service container
Picks a random imatge
Chnaged the layout a bit GF
李延俊组
Added sound-juicer-3.5.0
Interaction query api completed
sync db after step
redirect if no instance
add ssh keys
Merge branch 'master' of github.com:genbit/djangodash2012

Conflicts:
	django_tutorial/settings.py
script for "standard" indel and quality filtering
added total mapping quality to help with basic filtering
README.rst: documented coordinate frames and transforms
Added in SubActivity adapters. Corrections to databaseHandler in regards
to passing facility. Correction to performance of grabbing facilities
and setting facilities in AllFacilityActivity
add chat server example
update more examples
remove extraneous build target
change redirector URL to prevent SSL errors
按要求修改了，但是我似乎忘了如果检索得到了多个文件的时候，是导出所有文件的流吗？这个没有修改。

Signed-off-by: lenonb <lenonb@163.com>
Merge branch 'master' of https://github.com/ghdawn/AndroidCADview

Conflicts:
	bin/ADCad.apk
	bin/classes.dex
	bin/classes/me/lenonb/FileLocalObtain.class
	bin/classes/me/lenonb/FileManage.class
	bin/classes/me/lenonb/FileOnlineObtain.class
	bin/resources.ap_
Updated README.md, removed simple README
Registro y lista de categorias completada

sin estilo, errores en la pantalla 3, utilizacion de listStyleBoton para
las listas de las categorias ya en un array
replaced main with bart
reduce the difference between the provider
Use `fixmetodonotes` as the provided package name
Aggiunta 2 riga Profilo
Normalizado Logout dos Usuarios
Added tilemess and microac icon
django-1.4 compatible messages
Merge branch 'master' of github.com:gnowsis/django-avatar
fix bug on change language
Added a todo list to track things I wish to do.
Cleans up thirdparty include.
owncloud: rename placeholder Set value
support for ruby-1.8.7
Add features to test default show title when display_name method is :to_s
Script to fetch the latest photos from a Tumblr blog.
* Add support for ignoring specific users
* Improve JIRA link regex matching
* Add help comments for config variables
* Cleanup
Improve regex to fix case where multiple mentions did not work, fixes #415
Merge pull request #418 from gregmac/jira-improvements

Jira improvements: support for ignored users, improved regex matching
Merge pull request #417 from gregmac/00ecbb6eaffdb1161c36525597fd799336a6a915

Add support for loading titles, and removing ellipsis if needed
Merge pull request #414 from intentmedia/tumblr

Script to fetch the latest photos from a Tumblr blog.
Merge branch 'master' of git@github.com:gregmac/hubot-scripts

Conflicts:
	src/scripts/jira.coffee
Merge branch 'master' of git://github.com/github/hubot-scripts
Add trac script, with support for hearing trac tickets and changesets and showing info about them as well as links
Corrected install command example
Added sql to determine who is currently in (with a 12 hour expiration if member hasn't clocked out.)
basic "add multiple videos" and then save to mp4 is working
Store File type in db

need to also add a new column in the medias table "type"
tabs to spaces; self to base