labofsahil/github-event-dataset-2012 huggingface dataset:
improved course navigation, added subject views and controller
Rename select-date tag to date-select so that we don't shadow the Rails helper function select_date.
fixup search_test so we don't end up with silly typo fixes like our last two live-search commits.
integration test: remove obsolete line
hobo_jquery_ui is now optional, so remove it as a dependency from hobo_clean.   Our generators now must explicitly add it to Gemfile.
repo permissions management complete (though pretty ugly code)
Talk about autosave and a bad battery
Fixed normals on upper and lower faces of prism
Change shader to use a positional light source
implemented positional lightning on shaders
Texture switching for reflection maps
Fixed equations on fragment shader
object rotation and size controls
implemented basic instructions
impl. vote
Fixed objects icons
Nope, still got it wrong.

Have you ever herped so hard, you derped?
Initial commit

Broke old __pf type into __pf_*
Initial commit of __pf_ruleset type with basic logic
Fixed generated code and explorer

Generated code needed subshell escaped
Explorer wasn't parsing output of cksum properly
Fix typo

referenced ${rcvar.old} rather than ${rcvar}.old
Add logic to check for existence of files before interacting with them

if ${rcvar} or ${rcvar}.new don't exist, we can't rm/mv them.
set -e doesn't like [ blah ] && blah syntax

changed to if [ blah ]; then blah; fi format
migrated echo usage to cat with HEREDOC to improve readability
Merge branch 'master' into __pf_ruleset
Implement Nico's suggestions

Modified behavior of cksum explorer to print nothing if the file doesn't exist
Modified gencode-local to reflect cksum's new behavior
Modified gencode-remote to check states explicitly and error on invalid state.
Merge pull request #98 from jdguffey/__pf_ruleset

_pf_ruleset
Changed to only include failing example.
Finished writing functions. Now need to run tests.
info text is not hown anymore if the property is set to false
コメント調整
コード書くときの便利っぽい動き
Increment to v0.30.
Make `sqitch` a weak ref in Plan.
Get rid of lazy parser

Redesign incremental parsing interface
Rename D.C.Streaming to D.C.Incremental
coding style (now passes gjslint)
remove domutils.js
Fixing the make appcache-manifests on the mac
Clearer commment
playerDuration hack + code cleanup
Merge pull request #1070 from etiennesegonzac/makefile-fix-again

Fixing the makefile cross-platformability :)
Merge remote-tracking branch 'upstream/master' into l10n

Conflicts:
	apps/dialer/manifest.appcache
	apps/gallery/manifest.appcache
	apps/homescreen/manifest.appcache
	apps/settings/manifest.appcache
Chinese translation
Merge pull request #1068 from fabi1cazenave/l10n

[l10n] new homescreen strings
Merge remote-tracking branch 'upstream/master' into video

Conflicts:
	apps/video/manifest.appcache
Reorganize a 'little' bit the Makefile to make it simpler to read
Merge with upstream
Experimental Market app which wraps Labs' existing (and working) app directory
Replace install-gaia: gaia by install-gaia: profile
Merge pull request #1075 from krellian/owa

Experimental Market app which wraps Labs' existing (and working) app directory
Injecting the webapps and OfflineCache dir into the test profile to make the tests run again.
Waiting for the mozApps to load on the home screen before running the tests
Updating the tests for the subdomain apps
Merge pull request #1076 from vingtetun/devel

Reorganize a 'little' bit the Makefile to make it simpler to read
Merging with the recents makefile changes
assertions for translation
specialize memo
Better wording in the introduction.
Updated screenshot due to render artifact in Terminator.
Added ~/.vimrc.local sourcing if exists.
Don't rebuild map
Thread.Scheduler: Fix multithreaded task scheduling.
Calculate loudness based on Fast Fourie Transform

Calculate loudness based on Fast Fourie Transform
Added prototype of bulk transfer for put and add
delete DataObjectDataRefData tests
add separate caches for repo branches

For VCSes that checkout different branches in the same directory, like git and
hg, it can be nice to have separate caches for different branches so you don't
have to do a full cache refresh everytime you change branches in order to find
the files that are in only one of the branches. I have always got around the
issue by using a long-standing vim process for each branch and using the buffer
search to open windows for the new files in the two branches, but that's
obviously very specific to my personal workflow.

Note that the branch-specific caches are only used if the ProbeFindFileInRepo
command is used. So, ProbeFindFile and ProbeFindFileInRepo might use different
caches, but I don't think it'll be a problem.

In the interests of simplicity I considered having this off by default, but I'm
making it the default since I think it'll will be more intuitive for most
people.
bug fix. None==にしてたけどそもそもCellを受け取る関数だったからNoneなわけがない
順番がめちゃくちゃだったのをとりあえずxの小さい順から書くように変更
候補が残り一つしかないところを埋めるメソッド追加
DEBUG.初期マップ読み込み
Fixed a bug in generating updated source set and the resulting bug: that
chatcategories.yml was not updated in git.
working on hdf5
Clarify use with Rails
populate more datalists
detailVied is loaded with data
constats are added
Manifest version 2
Release 1.10.0
Bug 796778 - [Browser] Page titles on start page not same width as thumbnails r=benfrancis a=cjones
add multi_device.py
Cleaned up and saveing code
Added exclamation point

Punctuation is really important.
Move thread under rubinius::thread
Move config under rubinius::
Move immix under rubinius::
Revert "Remove unused LLVM file"

This reverts commit c20a599690b7d33241c0971aa0a79d2811e981c2.
Remove old LLVM task
Revert "Move thread under rubinius::thread"

This reverts commit 46e615e9dad82dbd991b9cca027d81ce4299c4df.
Revert "Move config under rubinius::"

This reverts commit 1c2981e88c452389a2611ccee1dec9e2f2158a41.
Revert "Move immix under rubinius::"

This reverts commit 04923cfdd62a4f631f029e8fe8830e4c7b8b9aaf.
Fix OpenStruct#initialize_copy
Remove initialize_copy tag
Remove obsolete RubyGems files.
Merge pull request #1745 from dtykocki/master

Fix for OpenStruct#initialize_copy (MRI issue #6028)
Specs for rb_lastline_get
Add rb_lastline_get. #1747
Fix rb_define_readonly_variable
capi/globals_spec.rb uses StringIO, require it.
Global $~ raises a TypeError if assigned an object that is not nil or an instance of MatchData.
Add specs to show assignment of a MatchData instance to $~ also changes derived globals.
Add missing rb_num_coerce_relop in 1.8 CAPI header

This suppresses the following warning from Clang:

  spec/ruby/optional/capi/ext/numeric_spec.c:77:10: warning:
    implicit declaration of function 'rb_num_coerce_relop' is invalid in C99
        [-Wimplicit-function-declaration]
    return rb_num_coerce_relop(x, y, SYM2ID(op));
           ^
  1 warning generated.
fix RPATHFLAG, fix #1674
Update Source/Target toString functions
Fix bug in materializing sequence files as PTables
Re-enable un-enabled PageRank tests
Renamed ControlledJob and JobControl to CrunchControlledJob and
CrunchJobControl to avoid naming collisions with core hadoop classes
in CDH3u4.
Make UnionCollectionTest order-independent

Remove the assumption in unit test that contents of a UnionCollection
are in a specific order.
Merge pull request #26 from gabrielreid/master

Rename JobControl and ControlledJob
Merge branch 'master' of github.com:cloudera/crunch
Version bump to support CDH3u4
Switch to an int instead of a bool in the internal top() func computation for hadoop 1.02 compatibility
Correct the protobuf version for Crunch
Move the CollectEmitter to test.InMemoryCommitter so we can use it in unit tests as well
app,model,view移管
clean
We should be ignoring all Python bytecode files (*.pyc) ...
- Initial monitor code added
for our future
bugfix
Attempted to tweak breadcrumb length.
Simpler page.
init
svg javascript test updated
add namespace to javascript
cleaning
copyright
wip
wip
change gitignore to allow submodules
change git configuration
change git configuration
change git configuration
wip
protein calc work in progress
point in time commit
wip
coordinates calculation bug fixed for horizontal line
membrane position fixed
wip
wip
protein length fixed
use POSIX 199309 by default when using clock_gettime
add <sys/time.h> and <bits/time.h> as headers into gettime when CLOCK_GETTIME is present
generalize random functions a bit more in preparation for fix of LAPH implementation

remove unif_su3_vector, generalize random_su3_vector to produce any type of random numbers
as supported by the RN_TYPE enum

beautify the way the random_vector function pointer is set byt introducing a macro,
code duplication reduced as well
add forgotten multiplication by 2*PI for unif_vector
update comment to match code
Merge pull request #193 from kostrzewa/more_RNG_fixes

generalize random functions a bit more in preparation for fix of LAPH implementation
Merge pull request #196 from kostrzewa/fix_clock_gettime

use POSIX 199309 by default when using clock_gettime
Merge remote branch 'upstream/master' into MoreTiming
remove unused
vim: ctrlp
add .bashrc
Fixed Highslide bug where the picture didn't get enlarged properly
Properly handle ARRAY and MAP atoms on the first iteration
thesis: add about lpc
text: thesis: add lpc some
Merge branch 'master' of github.com:venik/phd_src
add theme colors/sexy-railscasts.vim
Update zunka.css

Corrected comment mistake
Global include files added.
Global include file added.
Small optimization to array data structure to avoid unnecessary layouts
avoid NPE at shutdown after debugging
orders are starting to behave better
logo alterado
Merge branch 'master' of https://github.com/walkerman/fsi.git
optimizing intellypaste (in single cases it use the copy instead of creating temporary objects and move objects and so on)
Merge branch 'master' of https://github.com/webgme/webgme
testing network down scenarios...
Move into a table
New UI conversion
German updates from Stein-Aksel Basma
Norwegian updates from Stein-Aksel Basma
Norwegian updates from Stein-Aksel Basma
Fix amazon linux 2012+ version detection
fix helm + ref in poi
安装：修改安装界面
cms：给区块增加自定义cssClass属性
test sequence
test commit
test
test
just to save intermediate results
david approach working, metawalker needs to be fixed
meta walkers
make wp generate posts faster
Initialize db when new site is added.
adding scm-carbon-auth plugin to scm webapp

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131521 a5903396-d722-0410-b921-86c7d4935375
fixing a issue in supertanet mode due to wrong ST id

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130152 a5903396-d722-0410-b921-86c7d4935375
making error page fixing in config 

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132501 a5903396-d722-0410-b921-86c7d4935375
Adding registry test artifacts

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@133575 a5903396-d722-0410-b921-86c7d4935375
Add some ui enhancements

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@127276 a5903396-d722-0410-b921-86c7d4935375
merging commits to trunk

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@135876 a5903396-d722-0410-b921-86c7d4935375
UI support for sandboxing

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@127323 a5903396-d722-0410-b921-86c7d4935375
adding http headers in epr for basicAuth enabled services

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@128074 a5903396-d722-0410-b921-86c7d4935375
tests/api_matchspy.cc: Use a cached generated database for matchspy2
and matchspy4.

git-svn-id: file:///home/xapian-svn/xapian/trunk@16669 6b2f1b92-a4f3-0310-943f-de3cbe41748b
Algunos retoques
Fixes a check for zmq_disconnect version, this seems to be available in ZeroMQ 3.2.0
Merge pull request #66 from mkoppanen/fix-disconnect

Fixes a check for zmq_disconnect version, this seems to be available in ...
Fixed issue #67
Merge pull request #68 from hintjens/master

Fixed commit of marginal quality
Syntax style cleanup
Merge pull request #69 from hintjens/master

Fixed syntax style on some if statements
Fixed license to remove references to X11 code
Merge pull request #70 from hintjens/master

Fixed COPYING.LESSER
Merge branch 'phintjens'
Permanent timer and zmsg_recv_nowait fixes
Created dual-port SDRAM module that combines SDRAM controller and dual-port interface.
Added minimum overlap
add api; index.html
* updated project names
Barely started
Code complete
First debugging pass
add roles and refoctor testcase
add get excel by server path method
format xutil
Change the heap reservation for 64-bit platforms.

Hoard reserves a chunk of the address space to grow the heap into.
As there is a much larger address space available on 64-bit systems,
we may as well reserve a larger chunk of address space (64GB for now,
though could probably reserve a lot more than that and still leave
plenty of room for other areas).
add gemfile & change secret key
Rails 3.2.0 migration continues... (WIP)
Adding version file
Refactor code conventions
Removed semaphor from test consumer
Finish demo app, chapter 2
Yet another lua call without prefixed module

Signed-off-by: Arvydas Sidorenko <asido4@gmail.com>
Signed-off-by: Julien Danjou <julien@danjou.info>
Added a descending sort descriptor to the NSArrayController.
20121124
Merge branch 'master' of https://github.com/ylh6151/Team3
dkkim dropdown completed.
modify: forms in sys
modify: forms in sys
Borrado de session_start demás
Update tests for empty document
rhbz836051﻿ change uses of key code and modifiers in KeyShortcut to use Keys objects
Merge branch 'key-shortcut-aliases' into integration/master
Iteration group: work in progress: implementing maintainers for iteration group
Code review Changes.

Completely removed old HTextFlow and HTextFlowTarget database triggers (mysql and h2).
Reenabled history tests.
Changed implementation of contentHash to include all content strings for HTextFlow.
Execute TM searches against content0 for now
Add test for TextFlowTargetDAO.

In this revision this test only covers the query that is the base for copy trans.
Refactor tests to new plurals model.
Merge branch 'plurals' of github.com:zanata/zanata into plural-lists
test
Merge branch 'master' of github.com:zeld1/miniSIG

Conflicts:
	UML/cas_utilisation_miniSIG.moo
boo
added more plugin data
:poodle: and now we can get the neighbors hash when you want to use the distance
:rocket: spec and getter for intersection of sets added
update ganymed
parsing RTP header
p2p works with 3 parties; though noticeable delay
pktparser from master
update
Merge branch 'p2p' of github.com:zhenkai/peets into p2p

Conflicts:
	protocol.py
添加了出口策略
add items model
fix index for non 200 queries, index for slow queries
Updated vocab clean to remove keys with empty values and blacklisted keys
completion: fix typo in updated hook addition
Debugging for non-PDF PDF download
Update "Edit" string in zh-CN locale
Set the pid for iodine daemon.
socket restored
Texturepack is loaded out of the config file
local/config.h: Fixed possible buffer overflow
local/parse_config.c: Use strncpy() instead of strcpy() to avoid buffer overflows
new methods and order cleanup
Updated the rest
add 6try - integrates Den's method
Stub man pages for patterns and transports

Signed-off-by: Martin Sustrik <sustrik@250bpm.com>
[Vim] vim-railsインストール
[Vim] watchdogs.vim導入
brew unlink: don't unlink an unlinked formula

This caused weird issues in the case that multiple formulae provide
the same file.
pdfjam: add pdflatex Requirement

Fixes #13508.
Keg#unlink: Don't try to unlink if keg is unlinked
netcdf 4.2.1

Closes #13498.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
Bild ausgetauscht und im "Alt"-Text &uuml; statt ü
neues Bild für "Über"
direccion de oficina en footer
Merge branch 'master' of /home/manos/git/8manos
fix IE bug (rdfauthor doesn't start)
Added support for mapping csv/tsv files using Sparqlify-ML
+ New window style
+ Draggable Minimap
+ Minimap dumper
+ new gui (awesome!!!!11)
Added intent to add center-aligned PWM to this fork.
Referenced JavaScript
Switched from <script> to html::script and referenced style sheet
Added basic backbone structure
Added slips controller
Set up slips routes, model and controller
Исправлен (autoupdate by script)
ha retry is all reserved and shit
Visitor pattern implementation going on.
for development environments, made sure that the files are not merged into a large one in order to make debugging easier
mds: fix stray migration/reintegration check in handle_client_rename

The stray migration/reintegration generates a source path that will
be rooted in a (possibly remote) MDS's MDSDIR; adjust the check in
handle_client_rename()

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
mds: Fix stray check in Migrator::export_dir()

Commit f8110c (Allow export subtrees in other MDS' stray directory)
make the "directory in stray " check always return false. This is
because the directory in question is grandchild of mdsdir.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
mds: Send mdsdir as base inode for rejoins

Stray dir inodes are no longer base inodes, they are in the mdsdir
and the mdrdir is base inode.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
mds: allow try_eval to eval replica locks

Allow try_eval(MDSCacheObject*, int mask) to eval locks on replica objects
so that they don't get stuck in an unstable state.  The eval(CInode*, mask)
handles the non-auth already.  For the dentry case, call eval_any(), which
handles the non-auth case, instead of directly calling simple_eval(), which
does not.

Reported-by: Yan, Zheng <zheng.z.yan@intel.com>
Signed-off-by: Sage Weil <sage@inktank.com>
mds: Fix SnapRealm differ check in CInode::encode_inodestat()

When checking if inode's SnapRealm is different from readdir
SnapRealm, we should use find_snaprealm() to get inode's SnapRealm.
Without this fix, I got lots of "ceph_add_cap: couldn't find snap
realm 100" from kernel client.

Signed-off-by: Yan, Zheng <zheng.z.yan@intel.com>
Merge branch 'wip-mds'
Merge git://github.com/ceph/ceph
asdf
Merge branch 'master' of github.com:ceph/ceph
CrushTester.cc: slight style changes

Signed-off-by: caleb miles <caleb.miles@inktank.com>
Bump tests pointer

git shortlog d977b91..03a6a08f
Jennifer Hickey (1):
      Add tests for DB connections in Rails Console

Change-Id: I6e62cad156989757c6238b1f723f48705699fc1f
manipulate root html node for cleaner html markup
Merge branch 'v4' of github.com:Avalith/Fwurks into v4
$__view fix
start
more
changed mini-magick to rmagick
Remade site
Updated image a bi
Fixed merge conflict
include all classes in header
Ignoring bad pushname
Fixed build
Merge pull request #156 from CS340Group/beebe

Fixed build
Credit for original youtube/yt/omxplayer how to.
Mustard made me :c
Add note and fix Lua.
mc: Pendantic commit

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
mc: Fix various forward renderer bugs

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
mc/classic: Add options for speed

Signed-off-by: Jakob Bornecrantz <wallbraker@gmail.com>
fbshare trest 1
Added sample JSON

Added sample JSON file and test juqery data load calls from JSON.
update cell to use common lib method
fix both autowidth calculations and column_widths assignation. 
some styling updates for this example
Remove rake dependency.
fix transition from in-page to fixed-position nav bar; closes #23
added missing number formatting on invoice
#7 Resolution du problème de conflit de cours dans la même journée (affichage d'une ligne supplémentaire)
Added Compiler-RT repository support for Clang.
Update ckeditor to fix precompilation.
Complete candlestick graph.
makeopts_jobs is declared in multiprocessing, not eutils.
Handle closed sys.__stdin__, for multiprocessing

Buggy code in python's multiprocessing/process.py closes sys.stdin and
reassigns it to open(os.devnull), but fails to update the corresponding
__stdin__ reference. So, detect that case and handle it appropriately.
The buggy code is visible in http://hg.python.org/lookup/r73708.
repoman keywords.dropped: handle * and ~*
repoman: check deps for * and ~* keywords
repoman: fix dep check for * and ~* keywords

We want the effective ACCEPT_KEYWORDS to correspond to the current
profile's arch (rather than using wildcards).
transmitter station bug fix
new obstructions types underwater and hydrographic
endless loop bug fix in text tv
FUCK YEAHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHHH
geometry library added
Shake deck to shuffle
because off changes in finfo functionionality different magic is requred
only step if there's anything to calculate
remove activation from title bar

now that we have it in the sidebar's editor view
fix the set_node_parameters method
functionality for the sidebar's edit form

We need to decide which context menu options we'll drop now. Weights/Certainty for links, properties/names for nodes can now be edited via the sidebar.
server delivers correct status codes
edit nodenet properties in sidebar.
29th Aug
#166: ATP -> HTML 변환결과에 대해 DOM 탐색오류 수정.

ATP 결과에서 개행문자 제거.
Element의 클래스 속성 확인 후 숨기/보이기 애니메이션을 수행한다.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DtcArdbeg/src/net/skcomms/dtc/client/view/ApiTestView.java
Handy fix from stackoverflow
Deep Alpha 0.50
函数整理
函数调整
函数整理
Changed formatting and removed old PHP script
Started at applet.
+ Modul-Diagramme
Merge branch 'master' of ssh://github.com/Feuermurmel/ba
fix en mail de ogden fallida
v2.1.3 Fixing bug with the modal touch handler not allowing you to pick files on the right side of the screen. Passing back S3 key to users with S3 in their filepicker account
renaming a lot of widgets in mainwindow.py
Remove deprecated keys for page up/down
Fix problem with unicode paths on windows while downloading instance files
Merge branch 'custom_inst_ctrl'
Merge https://github.com/Forkk/MultiMC4
Remove silly dead code.
Renaming in simple gui mode is now limited to 25 characters (via error message).
Add square creeper icon (with glowing eyes)
Renamed the JavaPath field in the config file so that MultiMC 4 doesn't try to read it from an old MultiMC 3 config file. (which usually causes issues)
Increment version number.
Ignore console output when it cannot be read.

fixes #142
Added a new file for DoD
Refactored makerows
Removed not used imports, instances and cleaned according to rules compliance from sonar
changes in background in menus
Merge branch 'master' of github.com:Frolle/Schmaps
new background files
Added tests for CheckBusButton and CheckInButton
Merge branch 'master' of https://github.com/Frolle/Schmaps
Merge with master
Merge branch 'GPSPoints' of https://github.com/Frolle/Schmaps into GPSPoints
Merge branch 'GPSPoints' of https://github.com/Frolle/Schmaps into GPSPoints
Merge branch 'GPSPoints' of https://github.com/Frolle/Schmaps into GPSPoints
Tryng to change branch
Removing head
adding logfiles and chnaging the structure a bit
connection to external database now working
fix empty result
get subnet list by IP, return HCM for all unknown or IP with no latency different between HN and HCM
Fix who
git alias for pretty log
Added better dead text message shadow
group
Merge branch 'master' of github.com:GeniusWiki/dgm
group
diff
Fix issue where reddit links with text after weren't detected
BAM-88 Fix npe when using activityclient, as message id json representation had changed
Better error handling in the auth server
A few updates to Node Rating module.
Cleanup
Separate files for pageTableInfo structure.
Not necessary to set values to 0.
Add smallpage entry when there is none.
+ Fix address mask when cleaning cache in case of pagetable entry.
Fixed bug where the exceptions log wasn't reset when starting a new test
Improved calculation of response time percentiles
Fixed issue where urls that had no successful requests was breaking report creation
whitespace cleanup and remove of unused import
__iadd__ must return self
Merge pull request #36 from jukart/addfix

iadd should return self, unused import and whitespace cleanup
Cleaned up some comments and unused imports
Fixed error handling while calculating percentiles more proper.
Added Vagrant example.
Reoganized figures. Revised abstract and summary.
Updated bibliography.
Added a new citation of STITCH 3.
Implemented a simple script to help users setup iRODS CLI for IDS.

Signed-off-by: Chris Smith <chris@distributedbio.com>
TEST tag
Content top region
Added Coarse Grained Tree.
change to caeser
speed up factoring new axons
Ändrat bild i userguid
catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
converting some tests to assert_raises, and DRY'ing retrieve_variable changes

Conflicts:

	actionpack/test/template/render_test.rb
Replace ruby-debug19 which doesnt work on 1.9.3 out of the box with a more maintained debugger gem
Merge pull request #5874 from asanghi/3-2-stable

replace ruby-debug19 with debugger on Rails 3-2 stable
Check for nil logger
Merge pull request #5894 from norman/3-2-fix-nil-logger

Fix nil logger on 3.2
Add hook for add_resource_route
Revert "Fix #5667. Preloading should ignore scoping."

Causes a subtle regression where record.reload includes the default
scope. Hard to reproduce in isolation. Seems like the relation is
getting infected by some previous usage.

This reverts commit dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e.
Revert "multi_json is restricted to < 1.3 "

This reverts commit 9b14e3ff80ee4044cfd89a11effcb5f52eaf888b.
Use `Object#respond_to?` to determine which MultiJson API to use
Removes caching from ActiveRecord::Core::ClassMethods#relation

The #relation method gets called in four places and the return value was instantly cloned in three of them. The only place that did not clone was ActiveRecord::Scoping::Default::ClassMethods#unscoped. This introduced a bug described in #5667 and should really clone the relation, too. This means all four places would clone the relation, so it doesn't make a lot of sense caching it in the first place.

The four places with calls to relations are:

activerecord/lib/active_record/scoping/default.rb:110:in `block in build_default_scope'"
activerecord/lib/active_record/scoping/default.rb:42:in `unscoped'"
activerecord/lib/active_record/scoping/named.rb:38:in `scoped'"
activerecord/lib/active_record/scoping/named.rb:52:in `scope_attributes'"

Conflicts:

	activerecord/lib/active_record/core.rb
Adds test to check that circular preloading does not modify Model.unscoped (as described in #5667)

Conflicts:

	activerecord/test/cases/associations/eager_test.rb
Revert "Revert "Fix #5667. Preloading should ignore scoping.""

This reverts commit 1166d49f62ccab789be208112163ad13183224e2.

Conflicts:

	activerecord/test/cases/associations/eager_test.rb
Removes unneeded caching from ActiveRecord::Base.relation
Merge pull request #5898 from benedikt/3-2-stable

Readds the fix for #5667 and back ports the regression fix from #5718
Be sure to correctly fetch PK name from MySQL even if the PK has some custom option

Backports #5900

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
Changed the gitignore to include the tag files
Only include Rake::DSL if it's defined.

rake < 0.9 doesn't define Rake::DSL.
Merge pull request #5896 from sferik/revert_5861

Revert #5861. Feature-detect which MultiJson API to use.
ARes URL should be pointed to 3-2-stable tree not master.
Actually fixed archetype component addition / removal.
Implemented archetype instance serialisation.
Tweak form layout
Formatting of page
Comment out scaffold styles that inter
clean up
style
Day 8: 85% done!  yay~~
Added more tests to the PlayerTest area
new copy of week 5 assig
FIX de l'erreure de segmentation
Добавил отображение шаблона для вставки в код
Merge branch 'gh-pages' of https://github.com/Lapple/i18nora into gh-pages
April 4 5:50PM
Deleted target generated class
[Leewings] Algorithm Library
null
Better organization os .bashrc and added /home/lurst/bin to PATH
initial calculation for Inclinometer class
Adding User collection on its profile page
Update display of biography in User profile
Sort countries by name on stats page
Suppress some null warnings.

I'll revisit these later or something.
moving documentation from the .m file to the .h and implementing anything that wasn't documented
correction requetes et BD
Merge branch 'master' of https://github.com/MartaD/WhaToDo.git
Removing quads when there are too many empty ones

This was a pain to implement because I bumped into a weird Unity issue
where a gameObject will get stuck to the bottom of the draw order if you
Clear its mesh and give it less vertices than it used to have... or
something like that. To be honest I'm not sure what happened, but
setting someMaterial.renderQueue to do the render order works much
better, and makes more sense.
Modified the current vhost is message on the hs request page
Remove object files instead of whole build dir when cleaning.

Strangely enough, the old way of running rm -rf $(BUILDDIR)/ did not
work if BUILDDIR was a symbolic link.  In this case, the rm command was
a nop.  rm -rf $(BUILDDIR) would have removed the symbolic link whereas
rm -rf $(BUILDDIR)/* would have removed all directory contents.  We
adopt libfirm's strategy and remove all object files while leaving the
dep files intact.
some initial hacked up samples
Implemented voxel classification function
Python 2 compatibility
Merge branch 'master' of https://github.com/Mikhus/wsgikit

Conflicts:
	setup.py
Bump version numbers in 'include/version.h'.
Update the change log for changes in v0.2.0.

This commit also contains a ninja edit that removes the exact time of
the commit tagged as "v0.1.0". Releases are not simply listed with a
date; this is derived from the release commit.
Merge branch 'release/deku-scrub' into 'development'.
Change 'ocarina.vcxproj' to a bare project.

Previously 'ocarina.vcxproj' was an empty file. This commit fills the
file with the default contents created with Visual Studio 2012.
Added some create options
Start smart dependency handling
fix generic filter
Change language setting to use an ini file instead of the login.dat
Fix plCrashHandler external build
Fix zombie plCrashHandler issues

Win32 HACK: We wait on both the pfCrashCli handle and the crashed semaphore.
This way, we can proceed to exit pfCrashSrv when the client process exits
insanely.
Fix deadlock if plCrashHandler is not running

Only wait for the crash server to do its job if it's attached. Silent
failures are evil, but it's better than hanging forever.
Remove stale stack dump reports
Merge pull request #195 from branan/gehn7_fixes

Gehn7 fixes
Merge pull request #196 from Hoikas/minidump

pfCrash Fixes
Fix crashes caused by poor iterator usage.
More 'const', so that Rotate(vector) can be called on a const hsQuat&.
Convert the impact velocity to avatar-local coordinates, because that's what {Running|Ground}Impact::PreCondition() expects.

Fixes landing animations depending on what direction relative to the age you jump rather than whether you land forward or straight down.
Fix SSE3 detection.

CheckCPU() would always return true, letting the game continue and crash on an SSE3 instruction on non-SSE3 CPUs.
Add missing period at the end of the processor support error message.
Merge pull request #199 from cwalther/sse3detect

Fix SSE3 detection
Merge pull request #200 from cwalther/landing

Fix direction-dependent landing behaviors
Make Localization log message more useful.
Fix memory leak from copied string pointer in LocalizationDatabase.
Merge pull request #197 from Deledrius/l10n_fixes_iterators

Fix crashes caused by poor iterator usage in pfLocalizationDataMgr.
was not compiling update-sop-num instructions
Plugged Leaks, added several fixes.
Use Native Browser "bind" if available
Fix event leak, uki registry leak
Added _built callback on class creation that will be called after the entire class is created and ready to be used.
Added new event "Destruct" when class is starting its destruct phase for class (or class listeners) to perform any cleanup.
User changeset functionality
Moved random char to its own url (/random)
Generating modified main program - op_par_loops
Completing static python parser for C/CUDA with vector maps
edit all validate functions with jQuery
beggin sesion
ewsdfewdsgf
D:
Fix downloader with no hash
Merge branch 'master' of git.opennebula.org:one
Feature #1288: Remove delete-quota buttons from sunstone.
(cherry picked from commit fceb88ee6ee1bc9fa1b6cc786a085c7038e9bc59)
Sunstone: CPU is now a mandatory parameter in VM templates
(cherry picked from commit f0c22ca207816c6f0603ecc52c9c0cc8ce70c176)
Make use File::Map conditional on presence

If 'use File::Map' eval-s ok, then it is used.  Otherwise,
stubs are added to ensure the PDL::set_data_by_file_map
compiles correctly.
update version number in package.json for npm publish.
added juicer for yui3.
Using generics for BRAM instantiation
handle $conf.environment only returning strings
+ select command
no need to be a instance variable
Allow database index specification in options hash
Use database 15 for tests
Removing easy_install and demoing lines from index example. firstapp has installation chapter links and having peopel using pyramid outside a virtualenv is a bad idea
no period required
Fixed SQL tutorial functional tests for Python 3
Merge pull request #487 from ppaez/improve-docs

Fixed SQL tutorial functional tests for Python 3
Added admin bundle.
German language
Application changes
Add file opener helpers to vimrc
Imported from Aokromes/tc_aowow. Second Part
Add codemirror as a submodule.
Some work towards integrating codemirror.

Wrote a tomorrow night theme and got it stuffed into the page. Still ahve to
tie it together.
skit
skit
Merge branch 'master' of https://github.com/ReWork/ReStore
skit
fix conflict
refactor old copied code, fix some bugs
add nginx conf
changed vćube texture
This is expected to return a Version not an Array
TODO
Handle single and double quotes when regexing for the version
override Module#name so as not to blow up when the cookbook name is overridden in the metadata.rb file
Revert "MIFOS-5675 change css"

This reverts commit d9459810a7fbf10215dec035563fcabac88ca817.
Revert "MIFOS-4132 add if else to function"

This reverts commit b5001e303ea3fd51f9fb98a7cef8082cc6799040.
implemented support for subcommands. Closes #19
Cambio en sintaxis  "_" por ":"

Esto podría provocar un error si se especifica un nombre de entidad
"entidad_tipo", ":" no dan problema.
Remove `push.default: simple` (not compatible with Git 1.7).
Added some functions

Use functions for drawing later, added zombie class and blood splat
class. Some more math on screen area added, will make resizing window
function easier later.
default image messages Fb
#39 Full pixel calculation support for IE!

Added optional boolean to force pixel calculation
Cleanup of getStyle computedStyle
Cleanup width/height methods
refactored to use selectiomodel for action panel enabling
About page
Mission page
Merge branch 'master' of github.com:mozilla/bedrock into about-mission
Manifesto link
Minor code tidying

Switched some links to https
Removed some trailing slashes
Some fixes for mobile sizes
Loop-a-doodle-doo
Link to the new style guide
Merge remote-tracking branch 'refs/remotes/craigcook/about-mission'
Merge branch 'master' of https://github.com/mozilla/bedrock
Increase deaths threshold to 200
Salsa syntax highlighting.
Spellchecking
Remove malformed UTF-8 bytes
Don't let highlighting fail
Move bibliography to UTF8
Fixed all bibtex errors
Add chinese text
謝謝媽媽爸爸
tried to update the repository again
Add some tests for our new isNew accessor
Add catchError for registering errors to watch for and errorHandler to wrap errors on storage operations
Add more detailed storage errors and extend REST storage adapter to return more detailed errors based on status code
build files
Add subclass inheritance of catchError handlers
Keep controller context when calling error handlers
Prevent errors from firing callbacks if an error has already occurred during this dispatch
Rename 422 error
Merge branch 'master' into improved-error-handling
Removed unnecessary afterFilter test
Code cleanup, set env on RestStorage errors
Merge pull request #538 from Shopify/improved-error-handling

Improved error handling through catchError
fix 2>&1
fix stdout redirect.
Merge pull request #28 from mattn/fix_redir_stdout

fix 2>&1
Ignore tags
Merge pull request #24 from spl/patch-1

Ignore tags
Added source + stuff needed for maven
Added Config, Lang and Util class
Added permission checks for the use of UF/hammer/LB
check statusCode on fitbit and error is not 200.

This will make us a bit nicer with their rate limits (but we'll
still hit them :().
try not to go over the fitbit rate limits.

Keeps track of API calls and pauses just under the limit.
overwriting the same file is bad, ensure it's unique on a given host (for now), fixes #217
adds network updates, account updates, and includes into news type when theres links, closes #58
added photo scraping
Fixed some style issues
Fixed some odd permissions checks.
we should definitley be using compass-rails not compass
fixed broken tests (mea culpa)
It compiles with Qt now!
Moved all block light updates to the lighting thread
- Changed HashSets to hashlists
process dependencies without grouping double
Revert "Initial commit"

This reverts commit b7c274571c1642888126bfb184fe210543815af9.
Add some more pin definitions
Change default pins for LCD controller

(These were better to solder to where I moved it to)
Merge pull request #1 from Takesue/extends1

third
Merge remote-tracking branch 'origin/my'
allow # or s for fill crop
Another test for travis...
More obj_Miner building
Can dump to STDOUT now
Fix invalid JSON
Moved methods from lib/methods.js to app.js and added argument for config file to load
Proper DEPEND list and eclass info
ruby v.
assets
verify
assets
better sidebar
assets
calories calc
Copypasta errors.
Moved get_id into Entity, as the same code can be used by most Entities.
_fetch_id() can go into Entity.
Setting entity_table allows subclasses to be much simpler.

If subclasses of Entity include entity_table in the constructor args,
Entity can operate on the appropriate table without relying on the
subclass to override table-specific functions and invoke the overridden
version in Entity with the table name. Essentially, this removes massive
amounts of near-duplication across Entity subclasses, and potentially
allows subclasses that consist solely of an overridden constructor to
set the entity_table. Entity subclasses then only need any real content
when special behaviour is needed to attach or detach the entity.
Incredibly simple, Entity will handle all this class' operations.
several fixes, delete example xpl file, added service object
Initial updates for restructuring c code
renamed IXML related files
fixed renamed file references
renamed upnp code files
renamed
more restructuring
more IXML restructuring
simplified IXML strcuture once more
removed statics to resolve linker issues
further simplified upnp code
final changes, all restructured and working again.
Update src/me/TobiiBoy/Whois/WhoisListeners.java

Just checked for bugs.
Terrain/RasterRenderer: clip height deltas in GenerateSlopeImage()

Fixes integer overflows (TRAC #2478).
dlgConfigInfoBoxes: don't make the WndFrame a control parent

Fixes a crash when moving the focus (TRAC #2122).
- Changed the CEngine::Math functions to be static (should avoid potential multiple declaration errors in the future)
- Changed GameData::ClearAll() to be public
- Made the Clone functions of State and GameObject both const
- Disabled copying/assignment for ProgramControl class
- Changed ProgramControl to use SDL functions for its timing code and added the necessary Init calls/checks to enable it
- Ray2D is now officially public access
- Added an extra operator overload to Vector2D to allow scalar multiplication of any order
Initial commit with functional database model
disabled vampirtrace as OPENMPI errors with cuda 5
when subproject build fails print reason why

uvcdat buries the subproject logs in $BLDDIR/logs/$subproject
because they are voluminous. However we want to see the logs,
especially for dashboards, when a subproject fails.
increase log size to make it more useful
Fix for bug #10  .Now checks against numpy.str types
Merge remote-tracking branch 'origin/fix_openmpi_cuda5_build_error'

* origin/fix_openmpi_cuda5_build_error:
  disabled vampirtrace as OPENMPI errors with cuda 5
Merge remote-tracking branch 'origin/report-errors-to-console'

* origin/report-errors-to-console:
  increase log size to make it more useful
  when subproject build fails print reason why
Merge remote-tracking branch 'origin/uvcdat_fix_bug_10_error_writing_char_variables'

* origin/uvcdat_fix_bug_10_error_writing_char_variables:
  Fix for bug #10  .Now checks against numpy.str types
Fix trees growing into any type of node

0gb.us had [discovered a while ago](http://minetest.net/forum/viewtopic.php?pid=48897#p48897) that tree trunks can grow into any type of node.




This has recently become an issue when it started being [used to grief servers](http://webcache.googleusercontent.com/search?q=cache:9LPjJU_6JmcJ:minetest.net/forum/viewtopic.php%3Fid%3D3693+&cd=1&hl=en&ct=clnk). As it circumvents the rollback mechanism, it's pretty obvious how this is a serious problem.




I made a quick fix for the issue that allows the tree to grow only in air. The patch was originally posted in #280, but I thought it would be better to submit it separately.
input tools for the gmlib. v0.1
fixed errros
Command added: +rules
New command added: +faq

BadWord filter deletion in web admin now works.
Fixed Wikipedia button top margin
Open links in new tab in the about page
Allows IOM staff to review activity
fixed a bug with navigation entry update not converting & to &amp;
restrucutred page footer
upgraded mysql from deprecated mysql to mysqli
replaced mysql_insert_id
changed admin style
export pre launch + addition of custom formatters and buildmodes
Added functionality to only tile horizontally to CAAT.SpriteImage
cparse integration: 3rd stage, commands interface
cparse integration, 3rd stage, build fixed
cparse integration. 3rd stage, add locals and alloca (stackframe) support
Cosmetic changes for RAnalType
Fix consgrep segfault and do changes in print cmd

Add python print buffer (pcp)
Use psw instead of pS for wide strings
Add dir.types config variable
Fix segfault in RConsGrep
Fix dalvik pseudo ops disassembler (thx thuxnder)
Fix strange ELF loading and mips code analysis
Initial working tree walker for cparser (see td)
Fix 'pd.N' cmd, 0size sections, use eprintf r_anal
Fix build. enhace mips anal, add recursive disasm

Fix UCALL opcode analysis in mips
Initial implementation of 'pdr' recursive disassembler
Workaround for code wrong basic block size in pdr
Various little bugs fixed and pz/pZ renaming

Fix r_core_system pipes after scr.interaction
Fix 'ao N' (parse argument)
Fix segfault in p= N >blocksize
Split BBs in pdr with '--'
Add help for ps?
Do not show invalid rahash2 -a entropy at the end of p=e
pz is now psz
pZ is now pz
Première réorganisation
Final changes before development.

Separated Alib and Atlas.
тестовые данные
Merge branch 'master' of https://github.com/ZaiSL/youboard
Something
Merge remote-tracking branch 'origin/master'
Tilføjet texttt
Merge remote-tracking branch 'origin/master'
(expfunction.prc) changed to expand all exponentials at the same time
(expfunction.prc) bug fix: make sure there is an exponential to expand
cosmetic change: remove obsolete function
* added the ability to use an environment map in a2emodel (+select correct _env shader option and set uniforms), still wip
add some git settings in bash_profile and some corresponding changes
make more sensitive
Added login
New
Entities moved to separate assembly; balance fixes
initial coffee script
Add a 'spiral' one minute sliding window count/meter

Sorry about the name.
Merge pull request #28 from basho/master

Add a 'spiral' one minute sliding window count/meter
Add new metric and sample types to README
Merge pull request #29 from basho/rdb-docs

Add new metric and sample types to README
use bear tag
quotes
bump bear dep
support n-ary metric initialization from application environment at startup
Merge pull request #31 from campanja/master

support n-ary metric initialization from application environment at startup
an attempt to fix a few different cases in convert_cpu_topology
Use os:timestamp over locky erlang:now
Merge pull request #33 from basho/rdb-no-more-now

Use os:timestamp over locky erlang:now
Comment out deprecated system_info field

global_heaps_size is no more
Merge pull request #35 from DeadZen/patch-1

Comment out newly deprecated system_info global_heaps_size
Fix for single-core CPU

See boundary/folsom#32

Signed-off-by: Peter Lemenkov <lemenkov@gmail.com>
Merge pull request #37 from lemenkov/sysinfo_single_cpu_core

Fix for single-core CPU
better cpu topology test coverage
clean up and log cpu test case
Fix handling of c_compiler_used when only a major version is provided

This mostly occurs when erlang is compiled under MSC since it only
provides a single number as the version.  GCC can trigger this issue if it
does not have a minor version, but is probably rare in the wild.

Additionally, this allows for the case where erlang wasn't able to
determine which compiler was used (i.e. {undefined, undefined}).

Add test for the handling of c_compiler_used by convert_system_info
Merge pull request #36 from danielwhite/fix_system_info_for_win32

Fix handling of c_compiler_used when erlang was compiled with MSC
enabling dynamic content
changed generating order to improve caching
Subiendo el botón de play
Revert .json file listing of test suites.

Conflicts:
	test/SpecRunner.js
Re-implement performance suite filtering due to RequireJS changes in SpecRunner
code review comments
Merge branch 'refs/heads/master' into jason-sanjose/fix-jasmine-require

Conflicts:
	test/SpecRunner.js
Merge pull request #1037 from adobe/jason-sanjose/fix-jasmine-require

Change unit test module loading so tests can be refreshed without restarting the whole Brackets process
Fixed build for 0.11.x again.  Working on bringing version properties file up to par.
Fixed up versioning scheme.
SBT build should now mimic ant build for versions.
Added an incredibly hacky way for us to override the default sbt compiler interface.
Part I of the Lazy Vals Saga: Bitmaps are no longer inherited.
Part II of the Lazy Vals Saga: Saving bitmap by the Three Musketeers: Byte, Int and Long. And Boolean (hey, he also deserves some credit!).
Add test files for t5639 in pending/pos
Test case for SI-2066
Part III of the Lazy Vals Saga: Inliner strikes back. Or at least let's hope it will.
Add test for t5579 in pending/pos
minor tag-related fixes
Fixes SI-5199 through improved API docs
Merge commit 'refs/pull/486/head'; commit 'refs/pull/487/head'; commit 'refs/pull/488/head'; commit 'refs/pull/489/head'; commit 'refs/pull/490/head' into develop
Fixes SI-5629.

Adds an additional argument to the unify method in
specialization - `tparams`. When this parameter is set
to `true`, unification is done over type parameters in
poly types as well.

Additionally, the unification in specialization now
works over type bounds.

This ensures that in the below example:

trait Foo[@specialized(Int) A] {
  def bar[B <: A](b: B) {}
}

class IntFoo extends Foo[Int] {
  override def bar[B <: Int](b: B) {}
}

the method `bar` gets correctly determined
as a method that needs a special override
for its `bar$mcI$sp`.
Merge commit 'refs/pull/491/head' into develop
tests for SI-5726
test for SI-5722
test for SI-5610
test for SI-5654
test for SI-5521
test for SI-5585
all treemakers need positions for unreachable error
construct typed trees in TypeTestTM
unreachability

- reachability slogan: a case is not dead if all of the preceding cases fail and it does not
- assume guard/user-defined matches for unreachability unless statically known otherwise
- needs richer theory of subtyping and equality :-(
fuller dpll, trying to avoid looping
this is getting exhausting
fixing bug found by unreachability
SI-5739 address @retronym's feedback, more docs
Fixed GameWindow.
firefox <20 cannot into download attribute
More AI code
don't copy prelude into every module's symbols
that's dumb, seriously
Remove specialised array/vector comparison definitions.
Move general sequence comparison definitions to operators module.
Fix variadic inc/dec definitions in numbers.
Fix author mask position and share image
Remove click on header