labofsahil/github-event-dataset-2012 huggingface dataset:
Pass to connection_made() connected or listening endpoint

When we are connecting, it is useful to know the domain name
we're connected to.  In particular, because now our connect
accepts a space-separated list of domains to try.

When we are listening, it may be useful to know the specific
listening endpoint that was contacted.
StreamHandler: connection_made(): stop providing default rtt

Instead of providing a default rtt of zero, for when it was
not supplied, adjust Listener to pass connection_made() zero
in the only case when rtt does not make sense.
http/client.py: compute host header when we know real endpoint

Now it is possible to pass connect() a list of endpoints to
connect() to.  As a consequence, we cannot compute host header
until we know the one in the list that succeeded.  Otherwise,
the URI is invalid because it contains all the addresses in
the list, e.g.::

    http://master.neubot.org master2.neubot.org:9773/rendezvous

As a bonus, the host header now is always computed, regardless
that connect_uri is used.
Pass runner_rendezvous address to connect to, not URI

I want to specify a list of addresses to try for rendezvous, so I
need to pass runner_rendezvous the address (list) not an URI.

This has no effect on the request that is sent on the wire, and,
in particular, the request path is still '/rendezvous', as it
ought to be.
config.py: add fallback master server

This makes our infrastructure more robust, since Neubot will
work even if the main master server is down.  In this case,
simply the fallback master server will be used.
Merge code that allow to specify a list of master servers

Building on top of the recent connect() diff, this set of patches
allows to specify a list of master servers.  In turn, connect() will
try the whole list before giving up.  This allows for more robustness,
because the secondary master node may be reachable if the primary
one is unreachable, e.g.  due to network problems.
type: chunks -> chunk
install treetop by nanki
put swap files always into .vim directory
more expressive fugitive status line
always show tabbar
show line numbers
detect puppet files
our own mapper is now ,
disable ruby debugger
update fugitive
update rails and ruby
install conque term from http://code.google.com/p/conque
disable toolbar, set gui options only if it is present
install powerline with patched Inconsolate (from wiki)
VCF infos
overdue: populate account and tenant record id

Signed-off-by: Pierre-Alexandre Meyer <pierre@ning.com>
Rewrote one more time the createPayment routine to handle various failure from Plugin failures, Timeout issues and PaymeneError
along with all the correct retry logics. Need additional testting for Plugin failures and timeout issues.
Cleanup; also very experimental!
- tools run original kw parameter passed as **values[original]
- form button cssClass -> css_class
fixing s3fs building
Adding fully qualified path to new object creation.
Colisao e posicionamento relativo OK
Add check_authorization and convert hashes to old style
Add info about helpers
Remove obsolete fix_vhost filter
remove old files
update files (v0.6.18-release)
Correct render region calculation for blittable DC pan renders.
Stop showing "Paste Waypoint..." for some random pastebuffer content.
Fix Thumbnail anti-aliased was not performed in all codepaths.
Implement WPT deletion confirmations reflecting shared WPTs
Port out all jRuby-specific code to it's own file, included on detection.
Fixed matching related functionalities
Moved debugging.* to io.*
Delete local var not used anymore and use the right variable instead of left previous left over.

fix hg-538
Fix the condition to test the right thing.
Merge pull request #706 from nouiz/cmodule

Delete local var not used anymore and use the right variable instead of ...
rename file to don't be run by nosetests and pep8
node in the doc about the installation of xcode for mac
Merge pull request #716 from nouiz/small

Small
Moral - v1

Officially Released.
first (bugged) implementation
Reuse fetchedResultsController for iPad
nsfetchedresultcontroller logic moved to shared class
moves ipad search logic to shared class
Changed method name from "send" to "sendMail".
Circular stack was added
Mission history container typechanged from circular queue to circular
stack. Fixes #37.
Mission time management support provided
Added missing localization
organised init.el
Changing things around so that we do not need a ConcreteGlobal anymore.
Work around SElinux when chrooting
emacs-window-manager
fixed palette reading
new scripts update hubot
specify engines
add hubot-hipchat
Merge branch 'master' of github.com:okfocus/okbot
Changes: 14 sellostemma
funny stupid fix
First commit since coming up with an idea. No interesting game-y stuff yet, just project layout.
Config formats and scripts visibility at download widget. Fix #40.
Don't publish any password files to github
- DB: be more specific about how bootinclude affects the system image.
- DB: rebuild documentation
- fixed hybrid persistent writing with kernel 3.x (bnc #769086)
- fixed naming inconsistency: getSplitTmpExceptions/getSplitTempExceptions
- added unit test for XML split settings
- XML object unit tests for LVM related methods
- do not allow the use of the "size" and "freespace" attributes
  in combination. At present a user can specify both the "size"
  and "freespace" attributes on the <volume> element. In this
  case the setting of the "freespace" attribute is ignored,
  therefore allowing the combination of the attributes is
  misleading and should be disallowed
- unit test for XML validation of the volume element
  test to verify that the combination of "size" and "freespace"
  on the <volume> element is rejected.
Adding minidom dependency for parsing version number
Switch GS submodule to suite-3.0.1 branch
Accept single pattern as well as list in mk_virtual_tree.
Update documentation in filetasks.py
Support package lookup by name.
More flexible usage and better error detection.
Import XappForms from separate repo.
Include XappForms in the build, using nuget for dependencies.
Handle non-existence of dependencies/nuget folder
Require new ohDevTools to fix mono error.
First draft of ohjlazylist
Created a Xohj project
Added animation to the loading footer bar
Prevented loadText from appearing more than once
Added lazylist to examples
Added lazy list documentation
Fix Linux build failures.
Fix for build errors under mono.
Suppress test broken by Mono bug.
Remove unused log4net nuget.
Split Send* functions out of AppWebRequest.
More sane method of filename validation avoids a Mono bug.
escape ^Zz
Start to remove old hash table.
ok
oK
Cleanup / Refactor Code and Run Through JSLint

* Renamed the GithubApi object to GitJS to reflect the name of the library.
* Removed the `authenticateUser()` method since it hadn't been tested and the feature it's designed to facilitate hasn't been fully thought out yet.
* Validated code via JSLint
* Added a config object for future use
Merge branch 'master' of github.com:opnsrce/gitjs
Add alias configuration
Get rid of queues in Master.

– Remove WorkQueue code.
– Remove delayed operations in master.
    (Handled by RPC instead)
moved the add button to the right
Fix problem with non share collection item types being treated as collections
use str_ireplace instead of duplicate str_replace
Don't show status-right on minas-tirith
Allow skipping upstream fetch via an option
Keep track of the branch we were on and restore it
knockout updated to v2.2.0
knockout.mapping updated to v2.3.3
Update jStorage to 0.3.0
Merge pull request #523 from KenanY/jstorage-0.3.0

Update jStorage to 0.3.0
Merge pull request #521 from paglias/knockout.mapping-2.3.3

knockout.mapping updated to v2.3.3
Merge pull request #520 from paglias/knockout-2.2.0

knockout updated to v2.2.0
Port over a patch from @ocharles that add get_proto_by_name to Socket PMC, #606

Originally http://trac.parrot.org/parrot/raw-attachment/ticket/1724/getprotobyname.patch
[GH #606] Refactor Socket.getprotobyname, add test

Put it into platform/generic/socket.c
ChangeLog line for Socket.getprotobyname [GH #606]
Merge branch 'getprotobyname_gh606'

Tested ok on linux, darwin, windows
- Individual function die() will remove itself from empire
- Individual function reproduce() will add the new Individual to empire
[MIPS] Use NaN from roots to init global object NaN property.

In JS builtins $NaN is set from literal 0/0 assignment, which is
replaced in this patch to avoid NaN inconsitency on MIPS HW when snapshot
generated on simulator is used. The value of $NaN is further used to
init NaN global property.
Revert "[MIPS] Use NaN from roots to init global object NaN property."

This reverts commit a39823ede7a48cbf80e17606d7ce15e85c1b26e3.
[MIPS] Reinit NaN values after deserialization to fix NaN inconsistency.

The NaN values from roots and global object NaN property are incorrect
for MIPS HW when snapshot generated on simualtor is used. This due to
difference in QNaN coding on MIPS architectures.

The problem is manifested in mjsunit collection.js NaN test where for
NaN vaulues are generated different hash key if any of NaN numbers come
from snapshot.
Cosmetic (ARM/MIPS): Use FieldMemOperand where appropriate.
Review URL: https://chromiumcodereview.appspot.com/9963051

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@11207 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Check code kind when resetting profiler ticks.

BUG=121147
TEST=chromium gpu_tests/WebGLConformanceTests

Review URL: https://chromiumcodereview.appspot.com/9956060

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@11208 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Loosen up the test for boot time memory use on 64 bit.
Review URL: https://chromiumcodereview.appspot.com/9969051

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@11209 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Adding missing SetCC before conditional branch.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9950015
Patch from Rodolph Perfetta <rodolph.perfetta@gmail.com>.

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@11212 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Make progress in incremental marking if scavenge is delaying mark-sweep.

R=mstarzinger@chromium.org

Review URL: https://chromiumcodereview.appspot.com/9965054

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@11213 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Properly support shrinking arrays in CopyDictionaryToObjectElements.

R=mstarzinger@chromium.org
BUG=chromium:121407
TEST=test/mjsunit/regress/regress-121407.js

Review URL: https://chromiumcodereview.appspot.com/9968056

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@11214 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Fix race condition in test-thread-termination.

The test case failed to stop the preemption thread before destroying the
isolate which led to a race condition where the isolate was accessed
after it had been destroyed.

R=ulan@chromium.org
BUG=v8:2049
TEST=cctest/test-thread-termination/TerminateMultipleV8ThreadsDefaultIsolate

Review URL: https://chromiumcodereview.appspot.com/9969092

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@11217 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Switch regexp strategy for regexps that are just plain
strings with a small alphabet.  We already have code
that handles these regexps well, we were just not always
activating it.
Review URL: https://chromiumcodereview.appspot.com/9959096

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@11218 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
Merge remote branch 'v8/bleeding_edge' into hj-dev-kalmard
[MIPS] Set the external array allocation header size to 8 bytes on all architectures.

This is based on Erik's recommendation.
Review URL: http://codereview.chromium.org/9956049/
Unreviewed, rolling out r129982.
http://trac.webkit.org/changeset/129982
https://bugs.webkit.org/show_bug.cgi?id=97971

hit assert in fast/overflow/overflow-height-float-not-removed-
crash3.html (Requested by eae on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-09-29

* wtf/Platform.h:


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@129985 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Source/JavaScriptCore: Rolled back in <http://trac.webkit.org/changeset/127698> with a fix for
fast/dom/HTMLScriptElement/script-reexecution-pretty-diff.html, which
is to make sure that function declarations don't put their names in scope.

Reviewed by Gavin Barraclough.

    Named functions should not allocate scope objects for their names
    https://bugs.webkit.org/show_bug.cgi?id=95659

    Reviewed by Oliver Hunt.

LayoutTests: Rolled back in <http://trac.webkit.org/changeset/127698> with a fix for
fast/dom/HTMLScriptElement/script-reexecution-pretty-diff.html.

Added a more explicit test for the feature I broke in 
fast/dom/HTMLScriptElement/script-reexecution-pretty-diff.html.

Reviewed by Gavin Barraclough.

    Named functions should not allocate scope objects for their names
    https://bugs.webkit.org/show_bug.cgi?id=95659

    Reviewed by Oliver Hunt.

* fast/dom/HTMLScriptElement/script-reexecution.html:
* fast/js/function-name-is-in-scope-expected.txt: Added.
* fast/js/function-name-is-in-scope.html: Added.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127810 268f45cc-cd09-0410-ab3c-d52691b4dbfc
[Shadow DOM][Refactoring] Element subclasses should have a way to reject author shadows.
https://bugs.webkit.org/show_bug.cgi?id=95831

Reviewed by Dimitri Glazkov.

Originally, the availability of author shadows was decided by ShadowRoot class.
This change moves that responsibility to each Element subclasses to make future
author shadow support improvement local to each replaced elements, rather than
touching ShadowRoot.cpp for reach.

No new tests. Should have no behavioral change.

* dom/Element.h:
* dom/ShadowRoot.cpp:
(WebCore::allowsAuthorShadowRoot):
* html/HTMLTextFormControlElement.h:
(HTMLTextFormControlElement):
* svg/SVGElement.h:
(SVGElement):


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@127811 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Adding in README and LICENSE.
Some forward progress in getting the SpartanRPC sample building under IntelliJ (using the Scalaness compiler).
Initialize RemoteDownloader.upload_size to 0 instead of None.

This matches how we handle current_size.
Merge pull request #374 from bendk/fixuploadsize

Fixuploadsize
Merge pull request #308 from bendk/fix18806

Fix18806
Better? support for some CFA ops in dumping
Suport static exes with threads

Assume that if we're asked for a symbol in a specific shlib while tracing a
static executable, that it's in the executable instead
Add debug program to standard build.
nof5 isn't connecting at once anymore. it is no possible to call nof5.connect();
using nof5.connect()
don't access ticket_granting_ticket_id directly
cleanup methods for consumed and unconsumed
single sign out notifier
actually send single sign out notifications
Rewrite MiniMap to only be rendered at mapchange.
Implement minimap changes when the map changes due to events.
MapRenderer: Making the sort function strict weakly ordered for the orthogonal case.

addresses #611
Greek engine translation by Yannis Anthymidis
Italian data translation by Giovanni Dalla Torre
Merge pull request #610 from stefanbeller/refactorminimap

[Discussion] Minimap should be updated on events.
Don't use magic pink for MiniMap (bug fix)
Fixed resistances when charmed
Merge pull request #616 from stefanbeller/repairorthogonalsort

MapRenderer: sorting is strict weakly ordered for orthogonal maps
Revert change in 39250b7b5d
Merge pull request #615 from igorko/master

Fixed resistances when charmed
Add cost check to spawn powers
Merge pull request #619 from dorkster/master

Add cost check to spawn powers
Fix loading permanent transform from save
Merge pull request #621 from igorko/master

Fix loading permanent transform from save
Fix WidgetScrollBox refreshing
Merge pull request #622 from dorkster/master

Fix WidgetScrollBox refreshing
Merge branch 'master' of git://github.com/clintbellanger/flare
Document configuration location semantics
thumbnail fix for OpenGraph
using convert instead
Removed pfi::math::unoptimized().
Changed copyright year.
Fixed indentation in math/constant.h.
Merge branch 'constant'
updated file for Usability: Welcome wizard setup
fixed bug with starting from empty faces base
Fixed some typos in redis.conf.
Fixed replication when multiple slaves are attaching at the same time. The output buffer was not copied correctly between slaves. This fixes issue #141.
A few no longer used defines removed from redis.h
Protocol and I/O related defines moved into a separated section of redis.h
Protections against protocol desyncs, leading to infinite query buffer growing, due to nul-terms in specific bytes of the request or indefinitely long multi bulk or bulk count strings without newlines. This bug is related to Issue #141 as well.
string2* functions take a const pointer
Encode small hashes with a ziplist
Implements ziplistFind

To improve the performance of the ziplist implementation, some
functions have been converted to macros to avoid unnecessary stack
movement and duplicate variable assignments.
Regression tests for protocol desync bug related to Issue #141
Regression test for the main problem causing issue #141. Minor changes/fixes/additions to the test suite itself needed to write the test.
version bumped to 2.9.3
show GCC version in INFO output.
error in comment fixed
On crash print information about the current client (if any), command vector, and object associated to first argument assuming it is a key.
Possible fix for false positives in issue 141 regression test
added a comment on top of the zslRandomLevel() function
sds.c no longe pre-allocate more than 1MB of free space ahead. This fixes issue #252.
Obsolete SDS_ABORT_ON_OOM removed from sds.c
Don't change the replication state if SLAVE OF is called with arguments specifying the same master we are already connected with. This fixes issues #290.
Merge pull request #279 from kashif/patch-1

Fixed some typos in redis.conf.
jQuery upgrade in static pages.
jTour integration.
Made demo public.
Moved file loading to model.
Use a different colour for each player.
Fixed bug in deserialization of grammar.
Version intermédiaire article VPN IPsec + OSPF

. Rédaction section sur le tunnel GRE
- rel 4; update branch diff patch
- clean, proper fix for namespace clash

This fixes the case when 'P:group(NAME)' satisfies 'C:NAME < EVR'
group(NAME) belongs to RPMNS_TYPE_GROUP namespace and 'NAME < EVR'
to RPMNS_TYPE_VERSION namespace, so they should not be compared.
This should also fix triggers firing on NAME uninstal for packages
providing group(NAME).
merge plumi.skin changes and update footer portlets
The game boards are now set up vertically. I added colors to the gui, I mostly just got bored.
Use a submodule for simple-strconv.

Signed-off-by: Philip Puryear <philippuryear@gmail.com>
Disable riak usage in tests by default.
Slightly better RiakDisabledForTest object.
Merge branch 'develop' into feature/issue-397-use-riak-less
Better docstring.
tyop fix.
Merge branch 'develop' into feature/issue-397-use-riak-less
Add use_riak to message store cache tests.
Merge branch 'develop' into feature/issue-397-use-riak-less
Merge branch 'develop' into feature/issue-397-use-riak-less
Merge branch 'feature/issue-397-use-riak-less' into develop
Merge branch 'develop' into feature/issue-401-mkmsg_nack-all-the-things
sratch up
Merge branch 'master' of github.com:qishansun/Dup
Readme(2012.05.21)
Dark theme, but still need solution for form inputs.
Moving dark theme to its own stylesheet.
Styled form elements.
Updated About and some minor css tweaks.
Added permahash.
Removed old style comment.
Update 23.09.12
created client translation
added install via package manager
Merge branch 'new_renderer' of github.com:rainjs/rainjs into new_renderer
Rajesh commit merged
Started working on FPS camera
robohash avatars
Merge branch 'master' of github.com:rat4/wtf-code

Conflicts:
	src/main/scala/wtfcode/snippet/ViewCode.scala
Comunicacion Funciona. TODO - Intercambio de estructuras
TODO - Implementacion inteligencia Harvester
Nao consigo converter o payload em ponteiro para cassMsg_t.
Merge branch 'master' of github.com:rbrandao/cass
Introduce rGREEDY
surface: support cairo_surface_supports_mime_type()

Cairo::Surface#supported_mime_type?(mime_type)
Updating description
Cleaning up Library
Continuing summer cleanup
Getting rid of blockChanged() signals
Work in progress on modules
Working on modules
Completing modules
Modules, modules, modules...
Finished modules, fixed bugs
Fix for TypeError during endgame mode.
Removed commented code and simplified TestVariableIntCodec (comments of commit cce62c3b1577cd7d3f87feb4b02ee5406e381604) #40
subscribe expect a 200 status. else return an error.
Add constantly/1, and constantly/2. With tests
update gitignore
Remove asciidoc dependency for sample site.

Signed-off-by: Sébastien Gross <seb•ɑƬ•chezwam•ɖɵʈ•org>
More work on loader module
refactored merge, added test
Ref #525 - Move css/, img/, and js/ into assets/
Update documentation removing references to deprecated download section
Regenerated documentation
Saner default handling
Merged master changes
creation, update of feed
Merge pull request #9 from tomamic/master

creation and update of basic feeds
Actually put in the proposed change
delete .swp
edit users
edit users branch
Merge branch 'login'
un user por orden
user por orden
[fix] syntax: commas, semicolons
[fix] regexp: redundant escape
[fix] do while: broken syntax
[fix] global variables: missing var statement
You should use single var statement pattern
[fix] ICustomTag: mistyped noes -> nodes
Add setup.py and LICENCE
Budget implementation changes - part 3
Severely working on the import and export. I'm trying to implement writing to csv format.
A dictionary is now used, so we can more easily reference the loaded objects.
Cleaning up:
Removed comments that are no longer needed.
condition for RowSelectedIndex > - 1 CellDoubleClick event like in the case of double
clicking a column's width border.
Add test on 2 more urls
favicon-findme

icono de la aplicación 512x512
Learning rate decay corrected, 200 units, manual explaining away diag, ClassNLLCriterion,
classification rows normalized to 5, class dict grad scaled by 0.2
learning rate 10e-3, learning rates scaled down in proportion to the number of ISTA repeats,
minibatch size 10, 100 epochs pretraining
Repair after every 5th minibatch
L1 scaling is 9e-2, 200 sparse coding units,
encoding_feature_extraction_dictionary rows are normalized to 1.25/(num_ista_iterations + 1)
Orocos-KDL: debian inc 5 in groovy.yaml
added executable flag to setup.sh
Attempting to fix issue with special characters in annotations
ignore: Deleting old file
* Tightened the public API of JRubyAdapter and Script
Merge pull request #202 from ruboto/jruby_adapter_and_script_rewrite

* Issue #103 Tightened the public API of JRubyAdapter and Script
CMakeLists とバッチ修正
設定ファイル関連修正。
ibuffer -> anything
Merge branch 'master' of github.com:ruph/.emacs.d
Added functionality to comment out lines in midi.txt by adding '#' to the start of the line.
reorganized indexing into its own package
nifty words on readme.
added hot swap of filter funcs
more doc
fixed histogram axes, sleep debt chart
css bug
Merge branch 'master' of github.com:rymo4/linkful
fixed some script and ajax problems
fixed my rss feeds page
search page added
view page working some what
removed
moved all functions to function libary
search function for index page
additem js page
removed to function lib
rss page js
search page js
view page js
cleaned up my add item page
Updated README
Revert "Removed PKCS#1 RSA padding implementation"

This reverts commit c1bff73e84dae7f477e6cf74347eecf808f33443.
after loggin out
add another cup to the scope
Fixed issues with paragraph markers in list items.
Upgraded to rails 3.2.5
add support for calling custom http methods

here's an example:
HTTPI.request(:custom, request)
slightly improved logging
raise NotSupportedError for em_http auth
better gzip error message
fixed integration specs
updated the changelog [ci skip]
added support custom adapters

implements the adapter-part from #57.
stop passing the request to adapter#request

the request is already passed to the initializer.
standardized TimeoutError
changed the default log level back to debug
log to $stdout instead of STDOUT

allows a little bit more flexible log behavior.
fixed log level spec
updated the changelog [ci skip]
Modified theme for testimonial sections to work with longer quotes up to 70 words.
Fix exported variable name
map.mapKeys
Merge pull request #120 from S11001001/topic/map-funcs

map.mapKeys
Tiny optimisation to the Semigroup for Map.
adds implicit def unapplyA, which unpacks A into [a]A
Merge pull request #153 from eed3si9n/topic/unapplya

adds implicits to Unapply to unpack A into [α]A
bugfix: when Tilt doesn't find a file, it throws RuntimeError, not Errno::ENOENT
Added VILLAGER profession.
Possible improvements to group stability and overall system responsiveness.
State collection failed to collect state because messages disappeared from the send queue to quickly.
Merge pull request #100 from scj7t4/LargerGroups

Clock Synchronizer Rate / Protocol Change For Improving Large Group Stability.
PyPy test fix
somewhat working, context gets polluted
removed another instance of scrapy.conf.settings singleton, this time from scrapy.cmdline (which manages scrapy command line tool), by moving the get_project_settings() function to scrapy.utils.project
disable those physics debug prints
added favicon and setting up models
Merge remote-tracking branch 'origin/master'

Conflicts:
	swoll/static/css/squares.css
640/480/360 update
Merge branch 'master' of github.com:sdjl/jiepang1
Save bash history after every command
Add colours for MAN pages
Vim bufexplorer show relative paths
update ztree info.json
references and change of title
Add Bitter font and size up the title.
WIP trying to fit text on the job title.
fixing the local dev issues
Little command to retrieve a screen or start a new one conditionally
Fix trivial style issues with Cleaner class.

Signed-off-by: Thiago Farina <tfarina@chromium.org>
Merge pull request #80 from tfarina/master

fix trivial style issue.
Factor out DiskInterface class into its own source/header files.

This is a TODO in src/ninja_jumble.cc

Signed-off-by: Thiago Farina <tfarina@chromium.org>
add escaping function to python module
rename ninja module to ninja_syntax
Update configure.py for ninja module rename
Merge pull request #83 from rlarocque2/master

Update configure.py following ninja.py rename
Merge pull request #82 from tfarina/disk-interface

Factor out DiskInterface class into its own source/header files.
semantic change: allow reaching into parent directories in paths

This allows generating build files in a subdirectory of your source tree.
- Change CanonicalizePath to accept this.
- CanonicalizePath no longer has an error condition, so change it to a void
  function.

I profiled the result against Chrome and it might be ~100ms slower, but that
might just be Chrome's size working against me.  In any case I think there
are lower-hanging performance fruit elsewhere.
Move RealDiskInterface class to disk_interface.h.

This is a TODO in src/ninja_jumble.cc

Signed-off-by: Thiago Farina <tfarina@chromium.org>
Merge pull request #86 from tfarina/real-disk-interface

Move RealDiskInterface class to disk_interface.h.
Fix ninja compilation by including a missing disk_interface.h.

When running ./ninja the compilation fails because test.h uses DiskInterface but
doesn't include disk_interface.h to get the declaration.

Signed-off-by: Thiago Farina <tfarina@chromium.org>
Merge pull request #87 from tfarina/fix-ninja-compilation

Fix ninja compilation by including a missing disk_interface.h.
ninja_syntax.py: add include and subninja
Implement default target statements

This introduces a new directive, the default target statement, which
may be used to control the list of targets built by default (i.e. if
no target is named on the command line).
Fix a Clang self-assign warning by casting result to void
Merge pull request #90 from pcc/default-target-statements

Implement default target statements
Merge pull request #92 from pcc/fix-warning

Fix a Clang self-assign warning by casting result to void
Factor out State struct from ninja_jumble.cc into its header/source files.

This was a TODO in src/ninja_jumble.cc. Now this task is completed.

Signed-off-by: Thiago Farina <tfarina@chromium.org>
Merge pull request #89 from tfarina/state

Factor out State struct from ninja_jumble.cc into its header/source files
Split up varargs assignments generation
bar -> star (less likely to conflict)
Merge pull request #27 from sheniff/registercard

Registercard
Add support for offer
Merge pull request #28 from isingh/business

Fuck yeah!
updating dashboard with relevant data; cleaned up dashboard content;
updating dashboard with relevant data; cleaned up dashboard content;
Merge pull request #29 from kboyle/new

Updated dashboard content and grid data; 
misc
Merge pull request #30 from kboyle/new

misc
Add controller to fake a transaction
Merge pull request #31 from isingh/fake_trans

Add controller to fake a transaction
updates to dashboard
Merge pull request #32 from kboyle/core

updates to dashboard
Fake new transactions
Conflict fixed
new fake transactions
Add F5 hotkey
Merge pull request #91 from EvgenyZhlobo/f5-hotkeys

Add F5 hotkey
subproducts added to backend
Merge branch 'develop' into 0004-themes_settings
New modules and reports
Merge branch 'develop' into 0004-themes_settings
Merge branch '0004-themes_settings' into develop
Translation case:3
Fix a typo in Readme file.
Support foo.some_thing === foo.someThing
Added managed shovel
Add titles to dialog, fix usability overlooks
.gitignore 포함하지 않도록 수정
Added VCR, migrated test from Fakeweb
Added m for testing
Added lib to tests' load path explicitly
Refactored/converted base tests to use VCR
include only security related code
spelling, several authors
Updated documentation
Updated documentation
Merge branch 'develop'
Absurdly small spelling fix
some drafts for sdm_chem
删除老的程序
Add skeleton new class BroadbandModel
BroadbandModel implements AbsCorrelationModel
Add cmd-line options to specify broadband distortion parameterizations and pass to BroadbandModel ctor.
Bug fix: forgot to specify default fiducial, nowiggles models when closing last topic branch.
Implement parameter specification parser in BroadbandModel
Define BroadbandModel parameters in ctor.
First step towards using base class linear bias stuff
Use base class linear bias stuff
Remove references to BBand1 from BaoCorrelationModel
Remove refs to BBand1 from Aln2 INI file
Remove obsolete BBand1 templates from models/
Remove --broadband cmd-line param and its wiring to BaoCorrelationModel ctor.
Add r0,z0 reference values to BroadbandModel
Pass distortion models to BaoCorrelationModel
Use base class for redshift evolution of scales
Remove explicit references to bb and bias
Bug fix in AbsCorrelationModel (using _zref before it is defined)
Remove references to BBand2 (breaks backwards compatibility with upstream master branch)
Cleanup unused linear bias stuff
Throw RuntimeError in multipole evaluator
fixed depreciation
implemented Complex precision, and fix various arithmetic bugs, 1739 passed, 52 failed
Finally, jeebus.
fixed the missing "}" on main.
changed footer information and added place holder pages
Removed JDependFast.textui package
[KARAF-1703] Upgrade to aries 1.0.x

git-svn-id: https://svn.apache.org/repos/asf/karaf/branches/karaf-2.3.x@1368444 13f79535-47bb-0310-9956-ffa450edef68
add defer close of udp connection

The Go GC will automatically close the UDP connection, but often it's a
good idea to give the GC a hint by closing connections.

Before I added this I was getting problems with too many open file
descriptors, afterward this patch all was good - for my application I
was getting peaks of about 5000 open FD's, returning to about 5 open
FD's.
fix spello
tidy
doc fix
various
qtpfs update
added dialog box when click device delete btn
Node now saves cached transformations. Renderer improved.
added
added missing dependency
deprecated as these are now available in fedora
added
this is also unnecessary
Updated styles, added skill levels

Updated a bunch of css styles, added a basic skill level feature
Add "Python datetime library, adding things up"
change readme to markdown
fix map.js add active class
Improved Model template
Thinking with Masks
added in a "ktfunctions" class, static
made most things in HollowKTCollection parallel
로직 다 바꿈
namedtuple is a thing
don't fail in import if ssl isn't enabled at all

still fails, if util.ssl_wrap_socket() is called without enabled ssl.
(old behaviour)
FileStream improvement in Win32
Merge remote-tracking branch 'TsudaKageyu/filestream'
Change some variables to follow the TagLib naming convention
vimrc extract gui setting
Added Packet Pickup Date
Fixed #85
fixed #50.

amnam.com for testing.
added Javascript Inventory functionality to the product detail page
#43: Open external links in webbrowser
Abort ajax request when exit from application
Add cowpea plant spec
conditions관련 page, view 정리
processin tutorial
Minor changes before debugging the tests
merged conflicts
added inital verilog models
Add `plan` to App::Sqitch.
Some wordsmithing of deployment messages.
woopps^2
cleanup markdown syntax
SWIG: Add bindings for psmove_get_button_events()
Fixed errors in models.js and began writing signin methods.
Use new location for Twitter feed (the old one appears to have gone away?)
added @continue

like @break - as of request issue #1001
Accordion: Depreciated changestart event

"changestart" event in the Accordion control has been renamed to
"beforeActivate"

http://jqueryui.com/upgrade-guide/1.9/#deprecated-changestart-event-renamed-to-beforeactivate
removed extension_md5.rb and extension_numeric.rb (moved into tree.rb project)
Adding robolectric maven integration
bead
bead
Prepare for 1.2.
test
Style fixes
correct an indentation error
cache dev
Merge branch 'master' of https://github.com/tudo/WBE_test
ts=4 and shift=4 in .vimrc :/
the code of the first homework
Only show outsourcing button when a provider is configured
Error message on illegal document get
Include filename in style sync error message
Write debug logs on the background thread
Merge branch 'master' into study
Debug output from Java committer
Graphs of committer debug info
moving shotgun
Refactoring:Add function for prepare arglist.
new command line option, changes after peer review
First step of async-style. Async front-end (without backward compatibility).
Replaced demo-example in Readme.md
New rights of files.
Update message of 0.2.1 version in History.md
Added task to import cites listings
Added import:cites_listings to import:all
CDAta enabled config writer
now several ndpoly_monomials are allowd
removed dependencies in degree_of_polynomial_nd and degree_of_Ptilde
on phmc_* variables.

removed the global variables g_acc_Hfinal and g_acc_Ptilde which are
now monomial dependent.
Switched to chromium
Some small logging changes
useful
Added logging properties, empty corpus, changed back line endings to LF
Merged changes...
Added stubs for QueryHandler
correct the root url to /apps instead of /app
fix autocomplete only working once
basic path tab-completion
some cleanup
leave url_regex outside of an ifdef for now
Merge branch 'master' into scrollback-completion
Merge branch 'scrollback-completion' of https://github.com/vodik/termite into scrollback-completion

Conflicts:
	termite.c
update README
Styles for carousel
Autodisplay long logins in saved logins list
first tryouts
Merge branch 'develop' into Irrklang
Irrklang rewrote

now akts more like a sample player
fixed Irrklang bugs

now plays mp3
shows no strang current position
List ist not manipulated in Evaluate
fixed Irrklang help
update to .net 4 libary
play and stop as toggle
some minor changes
some minor changes
Merge branch 'Irrklang' into develop

Conflicts:
	vvvv45/addonpack/src/nodes/plugins/Sound/Irrklang/Irrklang.cs
Merge branch 'develop' of github.com:vvvv/vvvv-sdk into develop
add soundstreaming pin
fixed volume playback bug
ser default value for Streaming Thrashold
Enable Fx on play
Merge branch 'develop' of github.com:vvvv/vvvv-sdk into Irrklang
changed namings
named old irrklang folder as legacy
split Irrklang to Legay and new node
add soundfile to helppatch again beause of renaming pin
add Irrklang Legacy node to diffff.xml at version="45alpha28.3"
Again Pin Namings
Changes Nodename to Filestream (Irrklang)
space between authors sanch and phegma
fixed diff
changed naming of helpfile
one line
Fixed some comments and removed an unnecessary length comparison check.
Merge branch 'trunk' into padic
bottom link colors
delete files
tree travelsal downloading
Fix possible XSS with invalid real name
Open usermin login in a new frame, to avoid frame-origin policy https://sourceforge.net/tracker/?func=detail&atid=485894&aid=3597042&group_id=17457
调试内存泄露
add new project HomePwner
WFE-364: added debug code and updated dependencies.
fix metadata resolve problem with allow_overlapping_ip

Signed-off-by: root <root@control.choe>
Added main RPBot.py class
fixed paging control position css
Add doc and test
Played around with cookie support
build: added rsync to deb package dependencies
build: Makefile deb rule cleanup

Still doesn't produce "acceptable" deb package, but at least the package should
be usable.
Revert "5"

This reverts commit fd2fd7743044faac653a9188407ad02ddd29059c.
be able to using drb-spork to do ruby test
pasthighlights entfernt
Rename utils module to http.
Switch from AGLP to GPL
git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130333 a5903396-d722-0410-b921-86c7d4935375
commitin orbit patch for CARBON-12957

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130334 a5903396-d722-0410-b921-86c7d4935375
Fixing CARBON-12896 - Clean up session attribute while using dynamic seqs

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130335 a5903396-d722-0410-b921-86c7d4935375
Fixing ESBJAVA-993
Type change fix in property mediator

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130336 a5903396-d722-0410-b921-86c7d4935375
changing the hosting.mgt stubs class structure

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130153 a5903396-d722-0410-b921-86c7d4935375
Adding zip file upload functionality to hosting server

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@130154 a5903396-d722-0410-b921-86c7d4935375
migrating the carbon datasource creation functionality to user ndatasources

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@133771 a5903396-d722-0410-b921-86c7d4935375
adding doc changes

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@126865 a5903396-d722-0410-b921-86c7d4935375
Fixed the bpel multiple upload js

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@127163 a5903396-d722-0410-b921-86c7d4935375
refactoring lb end point

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@127164 a5903396-d722-0410-b921-86c7d4935375
feature proms

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@127165 a5903396-d722-0410-b921-86c7d4935375
Solving list apps issue

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@132169 a5903396-d722-0410-b921-86c7d4935375
improving OAuth login UI.

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@135184 a5903396-d722-0410-b921-86c7d4935375
Adding resource module test module for QAA - fix parent pom issue

git-svn-id: https://svn.wso2.org/repos/wso2/carbon/platform/trunk@131264 a5903396-d722-0410-b921-86c7d4935375
theme_breadcrumb replaced to reflect the page hierarchy
Merge branch 'master' into dev-will
Fixed sju.js file for default eggs

Still figuring out how to clear eggs cache
Move callback out of try/catch block.
data_t hack removed
Docs
Set + Time (teilweise noch ohne kommentare) inkl 3 Testroutinen
nothing done
Merge remote-tracking branch 'origin/master'
Menge von 10 Bauernhoefen mit je 100 Traktoren wird erzeugt
Merge remote-tracking branch 'origin/master'
Removed unneeded etag header set.  Also made code a bit more readable.
Added unit test to ensure that requests with proper a if-none-match header are responded with 304's.
Commint swingx and test classes
Some slight modifications to the installation guide.
jstl jsp
Raise exception if forest file not found
Move from YAML to Psych. v2.0.1
add gl libs
update
note for Kladimir :)
DHCPD のアドレス払出しを監視する tabid を追加
parse commit
[ios] Fixed multiple fetch after login.
pip installed pypattern
Script to create the SQLite3 databases...
Trying to make eMusic less hateful

This has been laying around, and I just want to commit/save it.
I want to make the emusic.com experience less ajax-bullshitty and more
like a normal web site that doesn't hate me.
touch event now handles touches number
trace_dumper: Start dumping records from the earliest record or the last record written
10.24 19:26 update
Bugfix circular reference while saving has_one relationship
Test for circular reference while saving has_one relationship
fix output safety issue with select options
add AS::SafeBuffer#clone_empty
use AS::SafeBuffer#clone_empty for flushing the output_buffer
updating RAILS_VERSION
Ensure [] respects the status of the buffer.
Merge branch '3-0-stable-security' into 3-0-12

* 3-0-stable-security:
  Ensure [] respects the status of the buffer.
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
bumping to 3.0.12
Merge branch '3-0-12' into 3-0-stable

* 3-0-12:
  bumping to 3.0.12
  Ensure [] respects the status of the buffer.
  updating RAILS_VERSION
  use AS::SafeBuffer#clone_empty for flushing the output_buffer
  add AS::SafeBuffer#clone_empty
  fix output safety issue with select options
Stop SafeBuffer#clone_empty from issuing warnings

Logic in clone_empty method was dealing with old @dirty variable, which
has changed by @html_safe in this commit:
https://github.com/rails/rails/commit/139963c99a955520db6373343662e55f4d16dcd1

This was issuing a "not initialized variable" warning - related to:
https://github.com/rails/rails/pull/5237

The logic applied by this method is already handled by the [] override,
so there is no need to reset the variable here.
fixed test when running with latest 1.8.7-p357 and ree
Merge pull request #5319 from arunagw/fix_test_ree

Fix test ree 3-0-stable
Merge pull request #5456 from brianmario/redirect-sanitization

Strip null bytes from Location header
Conflicts:

	actionpack/test/controller/redirect_test.rb
Merge pull request #5457 from brianmario/typo-fix

Fix typo in redirect test
Add order to tests that rely on db ordering, to fix failing tests on pg

Also skip persistente tests related to UPDATE + ORDER BY for postgresql

PostgreSQL does not support updates with order by, and these tests are
failing randomly depending on the fixture loading order now.

Conflicts:

	activerecord/test/cases/associations/join_model_test.rb
	activerecord/test/cases/associations/nested_through_associations_test.rb
	activerecord/test/cases/clone_test.rb
	activerecord/test/cases/dup_test.rb
	activerecord/test/cases/relations_test.rb
	activerecord/test/cases/yaml_serialization_test.rb
Fix more failing tests related to ruby 1.8.7 p358 version change
Merge pull request #5565 from carlosantoniodasilva/fix-build-3-0

Fix build for branch 3-0-stable
Build fix for form_options_helper_test.rb ruby-1.8.7
Fix AV::FixtureResolver and rjs tests with random order errors

Due to the hash ordering changes on Ruby 1.8.7-p358.
The new order number test method fails randomly - TRUNK-3506
Author: orien

git-svn-id: http://svn.openmrs.org/openmrs/trunk@28376 5bac5841-c719-aa4e-b3fe-cce5062f897a
The new order number test method fails randomly - TRUNK-3506
Author: orien

git-svn-id: http://svn.openmrs.org/openmrs/trunk@28377 5bac5841-c719-aa4e-b3fe-cce5062f897a
Remove unneeded jars from war file - TRUNK-3466
Author: orien

git-svn-id: http://svn.openmrs.org/openmrs/trunk@28379 5bac5841-c719-aa4e-b3fe-cce5062f897a
Changing from map to nmap when map is excessive.
add support for serializing a scala Seq as an array
add type safety to maps allowing proper deserialization of class types in maps and nested types
custom variables
sonatype task in build
this commit goes to the devel branch after the clone
use lua table to implement memory

Signed-off-by: Zju Toe <zjutoe@gmail.com>
* installcheck/Amanda_Device.pl: Correctly count NDMP test.


git-svn-id: https://amanda.svn.sourceforge.net/svnroot/amanda/amanda/branches/3_3@4733 a8d146d6-cc15-0410-8900-af154a0219e0
task setup & deploy changes
made all GetNative methods return the right size things
Create initial matcher functions
Catch all exceptions when reading a net msg
Merge pull request #59 from branan/msg_crash

Catch all exceptions when reading a net msg
Remove OR REPLACE from plpgsql language creation, since postgres 8.4 doesn't like it
Relicense under the AGPLv3+ -- closes #60
Make better use of move constructors
Miscellaneous C++11 and other cleanup (mostly nullptr stuff)
Use range for syntax to clean up some iterator-based for loops
cosmetic changes
make it work with old bytestring
References are back
adding group in apiCli help page
Improving the access to the swing event dispatch thread and exception handling within it.
Adding support for the quit action.
Setup guard
Delete crap
Add default SDK root config
"temp"
2012/12/14 commit
...
added ftp info
Fixed a bug in the BSBM mapping
Added I/O test
Changed some tests to be compatible with new address space
Merge branch 'master' of github.com:AVEx-6502/main
net: wireless: bcmdhd: Postpone taking wd_wake lock

Change-Id: I3926d7a1a357d173144f408996f35f0929db711e
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Merge remote-tracking branch 'common/android-3.0' into cm
Relaxed filepath dependency so it builds.
попытка номер три
[Add] Adding about dialogs. And doing a bad job.
[Fix] Merge branch 'master' of github.com:Allanis/Librum

Conflicts:
	src/Share/Share.pro
Nicer filename completion.
I know how to use magit in emacs
validate entities and other
Dodanie pól oraz getterow i setterow do Player.a
Dodanie wątku odbierającego komunikaty od gracza. Implementacja trwa.
turbo sprockets gem for faster asset pipeline precompile
Flesh out the README file with a little more useful information

The current README file contents are amuzing, but could contain
more useful information for downstream users / developers. This
is an attempt to fill out the README file with further content.

Change-Id: I1c364d107d1d6caf110d223560cee3a0a065ee6b
Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
Create instance in DB before block device mapping

Fixes lp 1019334

A recently added foreign key constraint on the the block_device_mapping
table causes boot-from-volume to fail, as the bdm is populated before the
instance DB entry is created.

This fix simply transposes the ordering to avoid breaking the constraint.

Change-Id: Ic62ea3ba000a2cdf58d2bd5bb17dde2b8cf340e4
Merge "Flesh out the README file with a little more useful information"
Merge "Create instance in DB before block device mapping"
Added class reference in brief description.
Merge branch 'testing' of github.com:AstroGPU/swarm into testing
clean up the run folder not needed
made changes in bets app

we now have models for bets and scores for bets (see models.py)
we also have a bet-overview (see views.py) --> lateron also
/bets/index.html
you can add bets via the admin
added some design files for bet overview
made changes in bets app

we now have models for bets and scores for bets (see models.py)
we also have a bet-overview (see views.py) --> lateron also
/bets/index.html
you can add bets via the admin
resolved conflict
resolved conflicts... hopefully
Updated Features set.
Changing content length for credit on art, and making age non integer based.
Final conversion script
Updating views.
Add TODO
Add Command '/wt list'
lib directory was being excluded from repo since it was in the .gitignore file included with the angular seed project