labofsahil/github-event-dataset-2012 huggingface dataset:
update bin/issues.scala on master to point to 5.1 milestone on GitHub
fix build script regression where extra junk was ending up in extensions dirs
update instructions for running bin/issues.scala to work with sbt 0.12
upgrade to sbt 0.12.0 final
upgrade to sbt 0.12.0 final
convert prim._constlist to Scala
convert _link/patch/turtle to Scala
relocate AppletTester to org.nlogo.tools

since it's not an automated test
sbt: turn off logBuffered for tr/tc/te/tm

because if you're only running one suite it's nice to see
the results as they happen, especially for a long one like tc
suggest GitHub first for issue reports
relocate some prims from prim.gui to prim.etc

since they have no compile-time dependencies on GUI classes
kill off moribund, undocumented __inspect-with-radius primitive
relocate a bunch of prims from prim.gui to prim.etc

the context is that we want the headless subproject to be self-contained,
but TestAllSyntaxes and TestChecksums and so forth need to know the
syntaxes of prim.gui stuff. either the prims are in the language or
they're not. and they are, for better or for worse.
oops
minor cleanup in sbt build
convert more of AbstractWorkspace to Scala

along the way sorting out inheritance problems causing recent
regression in mouse primitives when running headless
relocate movie prims from prim.gui to prim.etc

the context is that we want the headless subproject to be self-contained,
but TestAllSyntaxes and TestChecksums and so forth need to know the
syntaxes of prim.gui stuff. either the prims are in the language or
they're not. and they are, for better or for worse.
move user prims to prim.etc, kill off prim.gui

relocate all headless tests to headless (now that prim.gui isn't an
issue anymore)
oops get TestTryCatchSafe working again
bring back test/commands/UserReporters.txt

not problematic anymore after prim.gui elimination
imprint link should not be relative to subdirectory
Added main.hs
Переработан лейаут
CRUID для Enterprises
Made downloads public
SetCaseJob
Merge branch 'master' of https://github.com/OffWind/offwind
VFieldU fixes
Start/Stop case jobs
Simulation history
Improved History.cshtml
Engineering Tools - main page and breadcrumbs
FvSchemes/Default
FvSolution/Default.txt
DecomposeParDict/DecomposeParDictHandler.cs
RasProperties
TurbineOption
TurbulenceProperties
Fixed runTimeModifiable
Airfoil properties
CFD case preview
Chooses the largest possible integer scale when setting the size of a pop out window (issue #391).
First draft of the new Wiimote managing. Needs testing.
Open panel that is displayed when a rom is missing shows the original file name.
Support translated flatpages for FAQ and methodology
Adding Negation o VVector
What up, my home dog fly biscuit with peach jam on da side, how ya popin
finished active_admin started search with meta_search...what a night!
Better travis config :-)
Modify drops
Website's title centered for medium and high resolution screens
plop
parser
patch
patch
Merge branch 'master' of github.com:Phenix789/Zappy

Conflicts:
	Makefile
	includes/parser.h
[aml] fixed build, audio_set_delay exists in our ics/android
[aml] clear screen (in the right place) before shutdown
Fixed Mac Issue with  SystemMap_SizeChanged( )

Also Modified functions,lua to return OpenTK dlls for all OSs.
I don't need i.orig, I'm using git for Bobs sake.
Version bump to 0.2.0
Version bump to 0.1.2
Use www domain.
Regenerate gemspec for version 0.1.2
Teacher can grade student's homework and put some reason
Removed strip vtt and original webvtt test harness programs.
Added text track cue list struct and functions to destroy and create a cue and a cue list.
Changed functions to use return codes instead of the webvtt state in order to make it cleaner. This was discussed in class as a possible way to go and Shayan and I decided to do it.
Tis what the maiden declared
Merge remote-tracking branch 'jtim/COOK-477' into COOK-477

Conflicts:
	recipes/source.rb
fixed bug in itkAdapter
further adaptions to fvec3
chien cho
Ini import dialog appears in first run
Feature #237: First run dialog appears, and imports ini
Continuing with docs.
Add user access role for Bulk Application
pom.xml
Merge branch 'master' of https://github.com/SSilence/scotty
[s1613] Fix some warnings

Thx to stfx for porting

Signed-off-by: stfx <stfx@hotmail.de>
Signed-off-by: Schmoozerd <schmoozerd@scriptdev2.com>
Suite fonction protocole :)
ajout class Commentaire
project base structure added - one problem but i will fix it soon
Refactoring the UUID code and the managing of add/update together into a core
class. Adding place-holder AnalysisPluginInterface and uncommenting
methods that remain relevant in the FeatureStoreInterface
Started adding string resources for localization.
Finished adding resource strings for the Microsoft.AspNet.SignalR.Core project
Finished adding globalization culture info to the Core project

-Also reverted tracing localization changes
-For instances where we were using localization twice in one file I
included the Globalization namespace.
Finished adding string resources for the Microsoft.AspNet.SignalR.Client project
Finished reverting some localization changes that were not needed

-Reverted ArgumentNullException names
Added silverlight and wp7 string resources
Added string-resources to the WinRT client.

- Added a pre-compiler if to handle WinRT differently then the other
clients
- Removed System.Globalization pieces throughout the code base and just
used "using" statements
- Applied awesomenses to SignalR to make it more awesome.
Support alternative way of propagating client connection abortions.
- Detect OperationCanceledException.
Add instructions for tenderheart example app
order field in Menus
just a whole heap of a mess of files
Filter courses
Block `base64` and `openssl` by default.
Fix reverse method from Weighting class and add method from SymmetricMask

TODO is to fix some bug in MaskGenerator
Edited quickstart doc
Merge branch 'master' of github.com:SteefH/InfiRest
Исправление сохранения тегов у моделей контента.
Added mate-screensaver detection
Added chromium_flashplugin_path variable. Now default path is /usr/lib/flashplugin-installer.
modified plural paths
Sun May 13 08:57:07 IST 2012
* added multi world support to world protection module
Merge pull request #7 from Monofraps/master

Multi world support for world protection module
changed index.html to point to sherlock.js file on github.com
Load asides in different folder
Defined CHUNKSIZE as half BUFFERSIZE
Scanner should recognize all tokens, tests needed
Merge branch 'master' of github.com:Tellus/sw406f12
Fixed "OWNER attacks OWNER" issue.

Had switched around the two clone method parameters by mistake.

I double checked the abilities we use and they have the bare
necessities of valid targets - essentially they should only pick
between attacking ENEMY or healing OWNER, nothing else.
Created manifests
database migrated. haleluja
Updated README to mention random data generation.
more checks
adding command line for get and path, adding tolerant bbox swapping like on osm
merge
Merge branch 'mike' into events
Changing command line options to my odd programming style
Updating import and export with message style design
- Improved the readme file
- Corrected 'bord' to 'board'
Finance Model Code
placeholders for new specification fields
OPEN - issue GWDP-257: Stabilize database cache 
http://internal.cida.usgs.gov/jira/browse/GWDP-257

Switch POM to current Oracle JDBC driver to solve AbstractMethodError
exception.
IN PROGRESS - issue GWDP-258: Collect all test data from tests into a
single location and create necessary SQL 
http://internal.cida.usgs.gov/jira/browse/GWDP-258

Added methods checkSiteExists and checkSiteIsVisble to test base class,
use in FetchRecorderTest.
IN PROGRESS - issue GWDP-258: Collect all test data from tests into a
single location and create necessary SQL 
http://internal.cida.usgs.gov/jira/browse/GWDP-258

More data checking.
IN PROGRESS - issue GWDP-258: Collect all test data from tests into a
single location and create necessary SQL 
http://internal.cida.usgs.gov/jira/browse/GWDP-258

More checking
Merge branch 'master' of https://github.com/USGS-CIDA/ngwmn.git
newResume
syncdb works
working on rrequest builder spec
http request builder spec for GET method
introduced pathogen for managing plugins
added simple listmenubuilder
extended taskplanner logic
extended taskmanager
Add index action for incons controller
Merge branch 'master' of github.com:WebTales/rubedo
Made change based on comment from Jeff Hardy.
Updated assets relative links
health bar fix
Login added, tested, works
custom_messages.iss: move Basque messages lower
installer: add Greek translation
Switched from GDI+ to D2D
added spec example for restrict_paths
$storedInfo->{raidDevices} is a hash ref
Avoid reporting 'unusedDevices' as dissapeared

* An event reporting 'unusedDevices' as dissapeared was generated
  over an over
ChangeLog entry
Merge branch 'rduran/raid-watcher-fixes'

Conflicts:
	main/core/ChangeLog
Disable Webcontroller to show chip&&noti icons.
カテゴリのアイコン化
Fixed thrown exceptions when trying to evaluate variable initializers on template instance expressions.
recompile/update documentation
Added stats to master too
Presentation draft
ARC presentation
Started with Presentation
UTF-8 encoding in VIM by default
Use ASCII separators and enable C-b C-b
Merge branch 'master' of github.com:aclevy/dotfiles
move GroupForm to forms.py
gmail setup
Updated code comments in 2nd compression algorithm.
Minor changes to src files. Erased uselless calls to round() and double().
Added explanation of our first compression method and updated the 2nd one. It urges for revision...
add host ID to STATUS_NORMAL state
update tests for 7983bc
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host

Conflicts:
	src/java/org/apache/cassandra/locator/TokenMetadata.java
changes from review:

    * remove synchronization in Topology
    * require that StorageService.instance.tokenMetadata is cloned before passing to calculateNaturalEndpoints
    * simplify synchronization in TokenMetadata
Merge branch 'p/3881/00_snitch_topology' into refs/top-bases/p/3881/01_calc_natural_endpoints
resolve: Merge conflict in src/java/org/apache/cassandra/locator/TokenMetadata.java
changes from review:

    * remove synchronization on Topology
Merge branch 'p/3881/01_calc_natural_endpoints' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host

Conflicts:
	src/java/org/apache/cassandra/locator/TokenMetadata.java
	src/java/org/apache/cassandra/service/StorageService.java
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
Merge branch 'p/4122/01_bootstrap_decommission' into refs/top-bases/p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/02_remove_tokens' into p/4122/02_remove_tokens
Merge commit 'refs/top-bases/p/4122/03_group_stream_out_ranges' into p/4122/03_group_stream_out_ranges
change deploy script to set rails environment
Extracting common code for deleting everything from a db table
[refactor] Rename
Extracting the command state dumper to be non-squeryl specific
Using the by-command state manager for in-memory queues
Added some logging on rest server / node startup and shutdown
yeteneklerin düzenlenmesi ve admin sayfalarının oluşturulması #1, #4
Trying to make the new search system work
Working on getting a usable interface
just got the ranked retrieval working
#1 Identifier une publication soundcloud
added urgency graph excel file
change logger to use say
added price to feature, fixed to_feature sql bug
closing to working sideboard...
Merge pull request #117 from mikecules/master

Sail.js Bug Update
Merge pull request #116 from agamba/master

changed data save to on for the test 
Updated sail.jss (new commits)
removed bad sail.js
trying to reset sail.js in teacher...
Remove time out screen on new activity started.
Merge pull request #118 from mikecules/master

Fixed visual bug
Clear more databases
fixed message lookup of the location for events that dictate the end of an activity
Merge pull request #119 from mikecules/master

Changed Message structure for pulling the location...
Updated some instructional UI elements
Merge remote-tracking branch 'upstream/master'
turned off ui testing
Merge pull request #120 from pchen/master

Finesse to teacher tablet....
working for first test
removed extra submit_prin event sending from Done
Merge branch 'master' of github.com:encorelab/NEOplace
updated sail.js
try to ignore bad submit data
auth file for adding credentials
addin report file to send email
adding sendgrid python client
email to team
adding description file
allow dummy auth
Service names that were too long were reported as "more than 14 characters"
when they had more than 15. I believe the correct length is max 15, so I've
changed the error text to 15. The Apple docs confirm that 15 is the right
number.

From http://developer.apple.com/library/mac/#documentation/Networking/Reference/DNSServiceDiscovery_CRef/Reference/reference.html

> The service type followed by the protocol, separated by a dot (e.g.
> "_ftp._tcp"). The service type must be an underscore, followed by 1-15
> characters, which may be letters, digits, or hyphens.
Merge pull request #48 from ronkorving/master

Fixed incorrect error message
Pylint refactoring run.
Added Game.winner()
Get rid of with-array-pointer, since CFFI can do that these days.
Clean up some old dead code, fix stupid warnings.
Schools page is up.
Merge pull request #1064 from ahizzle/master

(trivial) Give express init middleware function an explicit name
utils: added pathRegexp()
ocd
Removed `Collection`
Merge branch 'master' of github.com:visionmedia/express
added param decoding test
router: moved params logic to Router#match()
tabs -> spaces
Unused require of fs module
added nicer error messages for failed view lookup. Closes #1065
removed debug() for .use()

connect does this now
removed req.cookies tests, this is connect
removed req.signedCookie tests, this is connect
typo
updated signed cookie tests
Merge pull request #1066 from cpedros/patch-1

Unused require of fs module
fixed markdown example
ocd
ocd
ocd
add admin
add reservation app
一将成名2013 【魏】武将：郭　淮


所属势力：魏

性别：男性



曾随曹操讨取汉中。



诸葛亮北伐，郭淮攻破列柳城牵制蜀军，有效配合了张郃在街亭的大胜，且先后随曹真、司马懿拒敌，参与了曹魏西部战区的全部兵事，屡建战功。姜维伐魏，郭淮又数次领军将其击退，并剿灭了叛乱的羌人，官至车骑将军。





一将成名2013 【魏】武将：满　宠



所属势力：魏

性别：男性



执法严格无私，不避权贵，深受荀彧赏识。



曾协助曹仁孤驻樊城，劝谏曹仁坚守，且力战有功，终得解围。任汝南太守时深得民心，离任时竟得举郡相从，奔随道路，不可禁止。后总督扬州军事，建合肥新城以抗敌，并射杀孙泰、料退陆逊，屡次击破吴军，终官拜太尉。





一将成名2013 【魏】武将：曹　冲



所属势力：魏

性别：男性



曾有一事迹被传为千古佳话。



五岁时即以刻舟称石之法计算出孙权进贡的大象重量。性格仁爱识达，曾以刀划破自己的衣服，告知曹操是为鼠啮之故，而让一名不小心使马鞍被老鼠咬坏的库吏脱罪。曹操因此对其非常喜爱，意欲以其为继承人。后不幸早夭，曹操悲痛不已，并对曹丕说道：“这是我的大不幸，却是你辈的大幸啊！”
"'一将成名2013'三国杀武将设计大赛"活动
是由北京游卡桌游公司联合桌友网、桌游志、中华网共同举办。本次大赛以为三国杀武将为主题，精心打造一场精美设计、创意产业、三国文化的盛宴。
"'一将成名2013'三国杀武将设计大赛"分为武将技能设计和图稿设计两种形式，两项同时进行、分别评比。在质量、内容、层次、规模等方面全面升级，采取"线上投稿"的方式，面向广大的桌游爱好者，动漫爱好者及设计人员征集作品，力邀重多桌游行业专家作为评选嘉宾，不仅在强调人物形象准确的同时也注重画功和设计感，还要强调对人物的理解及文字功底，让参赛作品爆发出最大的潜能。
 本届武将设计大赛将是中国桌游行业又一次激动人心的盛会，必将为推动中国桌游行业发展和挖掘新生代设计人才产生积极而重要的影响。
http://jiang.sanguosha.com/1jcm2013bs/hdsm.html

活动时间：


2012年12月17日－2013年4月1日

2012年12月17日－12月28日

武将竞猜





2012年12月17日－2013年3月22日

武将原画/技能征集



2013年3月25日-29日

作品评选


2013年4月1日

揭晓获奖名单


活动方式：

 本次大赛采用线上报名方式，参赛选手登录三国杀官网，点击"我要参赛"，根据提示进行注册，认真并完整填写个人基本信息（包含真实姓名、联络电话、有效证件及号码、邮箱等真实信息）。
 注册成功后，参赛选手须于2013年3月22日前在线提交武将画稿/技能作品。

设计要求：


1、

所有武将设计图稿均以电子稿形式提交，提交作品建议：
1） 作品请不要大于1M。
2） 作品支持格式为jpg、gif、png。
3） 建议作品尺寸 260像素× 370像素；



2、

所有武将技能设计需注意文字描述的准确性，避免出现理解上的歧义，必要时写明注释。例如：玩家与角色的区别，使用和打出等词语的规范性，引入特殊概念或有特殊情况的说明；



3、

参赛者必须登陆大赛网络征集平台完整填写大赛的报名表以留下详细的联系方式，如获奖作品由于个人信息不完整或因为信息有误而无法通知参赛者，都视为自动放弃获奖资格；



4、

每位参赛者可以多次上传作品，所有的参赛作品必须为参赛者原创作品，一旦发现任何抄袭行为则自动取消参赛资格；



5、

所有参赛者保留高精度的设计原图，规定尺寸：3000*3000。



6、

如属以下情况，则视为无效作品，将不予上传：
1）一稿多投；
2）参赛作品构成对任意第三方已有知识产权的侵害；
3）涉及黄色、反动、暴力、与政治相关、他人隐私等非法内容。


评选规则：




1、

大赛将秉持公平公正的原则，严禁一切形式刷票，包括申请多个帐号为自己进行投票。一旦发现有刷票行为，大赛将取消入选者比赛资格。活动主办方和活动承办单位的工作人员不得参与比赛。获奖者个人信息不正确，则视同该参赛选手自动放弃奖项。



2、

作品评选初评和终评两个环节。对在网络投票中有明显作弊投票行为，组委会有权取消其参赛资格。



3、

每件作品的网络投票可作为初评参考，评委团对作品进行最终评审。



4、

评审团将从图案设计、创意理念、商业价值三个方面对参赛作品进行综合考虑 。



5、

组委会通过电话以及Email等形式通知获奖者。



6、

本次大赛的评委会拥有对所有获奖作品的最终裁定权。


注意事项：




1、

作品展示期间，参赛作品的展示名称将由作品标题和选手姓名共同组成。参赛作品必须有一个适当的标题，字数不超过10个汉字。



2、

为保证大赛公正，大赛组委会实行实名投稿制，并对参赛选手进行身份证验证。



3、

参赛选手必须提供真实姓名和电话及地址。大赛组委会将严格保管参赛选手的所有个人信息，并对没有通过身份证验证的参赛选手取消其比赛资格。


版权说明：




1、

参赛者承诺本次活动所提交的参赛作品均为参赛者本人自行创作，参赛作品及随参赛作品提交的相关资料不侵犯任何第三方的知识产权，且不含任何非法内容。因参赛者提交的参赛作品所引发的知识产权侵权责任以及相关损失，均由参赛者自行承担；



2、

北京游卡桌游文化发展有限公司保留一切刊登和展出获奖及入选作品的权利。此外，本公司保留一切设计师创作、表演参赛作品照片及录像版权，并有权以任何形式将有关照片及技能翻录使用，无须支付任何版权费用予参赛者；



3、

北京游卡桌游文化发展有限公司有权挑选优秀的设计作品进行生产和销售，北京游卡桌游文化发展有限公司会为相关设计者提供相应的报酬，最终解释权归北京游卡桌游文化发展有限公司所有；



4、

获奖作品的版权归北京游卡桌游文化发展有限公司所有；











本大赛主办单位拥有对本次大赛的最终裁定权。
first basic data and code
Put comment into Master that tells me how to go about combining categorize and master
Cleaning up unused code and improving some variable names
Edit readme
Added some usage description
nexusjs todomvc example
Lots of clean and adding the demo jar to the dependency list
Fixed the logic in LoadFileStage to work correctly across slaves.
Made the MapReduce interface generic
More polishing
Fix broken GAE link
[TASK] Update placeholder repository.
Create lewylln.html
se soluciona problema de publicidad (frezeé)
se reemplazan las 3 publicidades por un banner vertical largo
mejora SEO
Changed trace files, reduced number of digits for intensity and change true and false to 1 and 0
ats error in test/DSS.dats
eliminendo django
aplicando estructura
Sample migrations
New models and migrations created
After running migrations
Change normal to 300
Remove stuff we've commented out
Remove licence icon from results container
Merge branch 'typesetting' of github.com:alphagov/static into typesetting
Todo implementado correctamente. FALTAN LOS TESTS UNITARIOS. Rakefile creado con opcion de jugar normal o jugar de modo verbose.
Handler tests
CreateProject and ListTasks passing
fixes in get_token. determation of labels added
save setting in xml
Conditional Imports should only import the first file in the list, not all of them. This change stops looping through the vars_files list as soon as a file is found.
Merge pull request #620 from pas256/patch-1

Conditional Imports should only import the first vars_file found in list
I like code that's always clean... (code clean up)
Proudly AGPL
Counts of the number of rows in each file.
A perl script to partition a file into n files. Each partition should be
shuffled with shuf or sort -R for a truly random permutation of the input
data.

This perl stuff is SLOW. Might rewrite in Go if needed.
1. Split functionality into several different files. StringidMap
handles the meta files, Vectors handles the generation of input
vectors, SGD is the actual SGD algo.

2. Added auc to SGD, from the scoreKDD.py file.

Has not been tested yet, but compiles and executes at a reasonable
speed.
todo file for project
scoreKDD file from KDD website
The very embryonic beginnings of a version for java, because c++ is irritating and it will be interesting to see if java is really slower.
Modified gitignore to ignore eclipse and gprof files.
Added brainstorming on how to make this thing more reusable, and updated some progress.
Removed a lot of uncalled quick-and-dirty print debugging functions from main.cpp. We might need these in the future, but main.cpp looks a lot better now.
Single-threaded SGD works!

Bugfix: "views" and "clicks" were part of the training metrics. Ugly hack to remove.

Total number of iterations, number of iterations between AUC computation, and AUC file now parametrized.

AUC implemented and seems to be working.

Disabled regularization for now.
Looks-like-working single-threaded SGD in Java. No decay. Update rule
via interface. Vector in memory is sparse.
Changed SGD to use Integer,Float instead of Long,Double. See discussion in
todo.org.

Summary: vector in memory can't be sparse, has to be dense. Sparse vector is
simulated by hashing, but array can't be indexed by anything apart from an int.
That gives us a max 2^31 dimensions, but that really should be enough. It's 2
*billion* dimensions.

The iterations counter might still have to be Long, however, so the lazy decay
vector will have to be long[].
Single-threaded SGD works! Tested with KDD scoring file. (0.67 purely on adid,
with a quarter of the data. Shitty I know.)

Array-backed map implemented. (This way we can have a map-looking thing that's
not actually a sparse map in memory.)

ConcurrentQueue being used by SGD.

Need to make the producer thread in SGD put poison objects rather than relying
on a pre-set number of updates.
todo.org updated with more design brainstorming
Parallel SGD works!

Bad news: reading from disk is too slow to take any advantage of that. So we
made an iterator that pre-generates and caches samples, and feeds a loop of them
forever when asked.

Also got the log4j system working.
commit name changes

name fedena changed  to cognus in en.yml file
added mail details
added playthru keys
added playthru keys to production
fixed first name,last name,responsibile party field validations
added css
added name-spacing for consumer girl scout tab
chaned permission form view
changed mail template
fixed button
changed template
added user_id in activity_permission_form for unregisted user
SAKIII-6173 Phase 3 of new photo upload implementation
https://jira.sakaiproject.org/browse/SAKIII-6173
SAKIII-6173 Drag and drop file upload functionality working.
https://jira.sakaiproject.org/browse/SAKIII-6173
SAKIII-6173 Cleanup, round 1
https://jira.sakaiproject.org/browse/SAKIII-6173
add DevNullSink
added clear and clear errors to coordinator interface
refactor field spec, now there is a field spec which is the base and a unary field spec for single field specifications
scenario, map support started
fixed merge conflict in DataManager
RenderTarget interface, played with map rendering
new render design work, removed obsolete RenderGraphic
small additions, removed Noncopyable
coding standard changes
add info to clean-cp.info
Second production version

Worked on features needed for my actual calling application, but I
forget what. I think I added DeleteWhere() and DeleteAll() in sync and
async forms.
Add new databse structures
Process map reply using the new database structures
Add rloc probing, smr, start changes interface
Read information from configuration file and add it no the new data base structure
Merge remote-tracking branch 'alopez/tun-tap' into tuntap

Conflicts:
	lispd/Makefile
	lispd/lispd.c
	lispd/lispd_lib.h
Add String#substring_after
Make Node assign its own ID

We now keep a class variable that keeps track of the global number of
Nodes ever created, and use that to set Nodes' IDs in the constructor.
Move disconnected node detection to AsciiDag.parse

This seems more like the parser's job than Graph's job, since the parser
is the one that made the mistake in thinking these labels were nodes in
the first place.
Parse more branch labels before looking for nodes

Now we parse unarrowed branch labels, arrowed branch labels, and quoted
branch labels all before starting to look for nodes. This required
making us more strict about the type of node names we'll accept
(basically now just "x" or "x'").

As a nice side-effect, Node#label no longer returns a quoted string for
branch labels that were originally quoted. Also, quoted branch labels
that are directly adjacent to a node are no longer merged with that
node.
Allow node names like Y*

This was a regression caused by
7bf95e8aa3b1d394ff6d11ab73d7d42337ae544f.
added new deflect method
location_index and search_index css updated
Moved scans to system page.
Add jvm test loader and supporting api
Rename filename to basename_c
Updated code to support TB20 down to TB8
Fixes + preliminary use name instead of type in layout fields
for specifying the layer type
Layers have to specify a name
Reworked the factory system to use a more graph-based approach
(more flexible); cleaned-up the factories of unused methods
Fixed frame drawing
Removed mention of Python 3 from MacPorts section for now, since configobj is not available for Python 3 in MacPorts.
minor typo fix in stats.funcs
Add the file sdffs ( this file is clean, I put the script on another
update )
Add more escape options for vim
Make regions Cloneable
Fix #region mask
Add a dynamic region mask
Implement InvertedMask & UnderOverlayMask as decorators
Fix CombinedMask created with /(g)mask commands
GPSockets fix
GPDeltaDiff fix
NoScript addons.mozilla.org release 2.5.3

v 2.5.3
=========================================================================
x [XSS] Fixed false positives on URLs containing an ASP.NET cookieless
  session identifier (thanks Trupti Chaudhari for reporting)
+ noscript.eraseFloatingElements about:config preference to switch the
  mousedown + del key floating popup erasing feature off and on
x Limited the mousedown + del key floating popup erasing feature to pages
  where scripts are forbidden and to absolute or fixed position elements
x Fixed JavaScript URL non-void expression evaluation in the URL bar
  causing scripts to get globally allowed (thanks al_9x for reporting)
x [XSS] Work-around for a Gecko URL parsing quirk (thanks .mario for
  reporting)
checkbox style added
Merge branch 'master' of github.com:aweis/15-237HW4
add nsfw shield by ms and rh

Signed-off-by: Dave Yingling <david.yingling@gmail.com>
fix admin view of users added per week
list 50 popular tags instead of 15 on admin page (to get around bot bloat);
recovered Aspects and Stream terminology
add popular tags to right section and View On Home Pod to public posts
add link to *real* home page on logout screen
fix photo reshare bug
add %{dist} macro to spec file.
describe as name with uuid
Merge remote branch 'upstream/master'
Merge pull request #39 from Toko/master

pull request #32 のbugfix
move Hijiki::DcmgrResource constants setup to Rails initializers.
add backup object resource to ruby-hijiki.
renamed 12.03/backups to 12.03/backup_objects.
rename Snapshots to Backups for GUI.
Fixed several crashes in sta when booting a volume based instance
gui: add monitoring alert email field and enable checkbox.
dcmgr: add instance attributes model/API for monitoring.
gui: change monitoring item component to allow to set each item only once.
gui: remove console object references from core.js.
dcmgr: split file.
Detect the bridge IPv4 address using ip/ifconfig for the relevant interface name, rather than relying on 'Isono::Util.default_gw_ipaddr'.
Added stricter IP anti-spoofing flows to vnet table.
Use dc_networks config to create ovs bridge controller sockets.
Added network scheduler it's select the network with the least number of allocated IP
Added checks for the rule files in netfilter-restore script. Showing warning when they're not there but not failing
Fixed a bug in the openfz failure recovery script where it attempted to mount the wrong instance disk partition due to duplicate uuids
Added some comments and removed an unnecessary export
rename LeastUsage to NetworkGroup
Merge branch 'master' into feature-nwsvc-monitor
admin: Fix error "expected identifier, string or number" occur in both IE7 and IE8
dcmgr_gui: Fix error "expected identifier, string or number" occur in both IE7 and IE8
dcmgr: check resource ownership only when it is an AccountResource.
Fixed a bug in netfilter when deleting two load balancers. When removing networks from the cache, there was no check for empty vnics (that are not in a security group) that might still be left in the network. Therefore it was possible for a network to be removed from the cache while there were still other empty vnics in it. If that happened, there would be a crash the next time a vnic in said network is destroyed. I added the needed check and now it works
Supported Cross-Origin Resource Sharing that Internet Explorer version 8 or later.
added test suit for salt mechanism
added info about salt mechanism to README file
Reverting the Drop API for now, we need to re-evalute this as it is causing too many issues and blocking releases.

This reverts commit 2d17b0c24e2de982c09ad6050a95db0fac70c3ad.
[Bleeding] Added SpawnReason.BREEDING. Addresses BUKKIT-1356
[Bleeding] Add null check to getFacing(); Fixes BUKKIT-1249
[Bleeding] MetadataBase now properly takes the metadata key into account when computing hasMetadata(). Addresses BUKKIT-1211
[Bleeding] Removing the last metadata item for a key now sets hasMetadata(key) to false. Addresses BUKKIT-1380
Updated version to 1.2.4-R1.0 for release.
Updated version to 1.2.4-R1.1-SNAPSHOT for development towards next release.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	pom.xml
Merge branch 'master' of https://github.com/ayunyan/BukkitJ
DCM lab1 part1
Added a ZiboHack-specific README file; rename the old one
Add two death reasons
Merge branch 'wizmode_ext'
Add paranoid_quit patch <http://bilious.alt.org/?44>
Actually enable the paranoid_quit patch in config.h
Fix the lava and clairvoyance bugs
Uncomment the "partridge in a pear tree" line
Extend enlightenment final/wizard numeric details
Remove "you hear air currents"
Merge branch 'wizmode_ext'
Add the statue glyph patch <http://bilious.alt.org/?83>
Merge branch 'patches'
Add pickup_thrown <http://bilious.alt.org/?98>
Enable autopickup exceptions by default
Make demons (M2_DEMON) ignore Elbereth (and ?oSM)

This should add some balancing to the late game
(especially the named demons) while not making
the early/middle game any more difficult. Well,
except for fountain quaffers ;)
Fix the lava and clairvoyance bugs
Fix the pickup_thrown patching (probably my own mistake)
Apply xlogfile patch <http://bilious.alt.org/?289>
Add a mode field to the xlogfile (wizard|explore|normal)
Add a nice variation to sokoban

Make the "oR a c"oRS and the BoH a cBoT
Simplified the Writer API
open files in the universal newline mode
dynamic window title (seo)
facebook recommendations social plugin
google analytics script
webmaster analytics meta tag
product details center image
more ui stuff, notification on launch of sched sportsdate
i2c and DS1338 works
updating install instructions for 1.1.2
Merge branch 'master' into publish
Option to clean up after a build

OWL_CLEAN_UP can be set to true to use makepkg -c flag on install.

For git builds we don't want to clean up after the build since that
limits the usefulness of 'owl pull'.
Merge pull request #8 from Spitemare/master

Option to clean up after a build
#3 delete event uses rel attribute for determin track id to delete
Symlink filename changed
Symlink filename changed
Added request type and number of votes to info returned in getQueue.php.
'Global Constants' Table.

i.e. set a global constant to true so that the queue is cleared before
adding more songs.
collection prob exams to RNW!
np
Merge branch 'master' of github.com:bechu/playbox2d
drag up on windows
Removed excessive <div> in the action sheet.
Added `jqt.menusheet` and tried out the atomic-page-navigation idea.
Implemented follow-link on <a> to open menu item.
Merged in some update to actionsheet.js
Fixed slide and slide up animation.
Cleaned up unused changes to get animation working.
Reworked menusheet to be a proper jQuery plugin such that we can unbind animation event properly. It fixed a bug that affect the first page navigation after menusheet.
Added manual ease-in and ease-out for 3d animations. The ease-in (ie, 5% {...}) worked around incorrect viewpoint shift caused by webkit height miscalcuation. The ease-out (ie, 95% {...}) reduced flickering at the end of the animation.
Adjusted menusheet's menu width.
Used pseudo::before to protect from secondary page action. Added manual ease-in for pop as well.
Moved css loading to the front of the js file
Reused ::after that _base.scss use.
Converted actionsheet to the better plugin layout that menusheet use.
Fixed jQTouch for jquery bridge2. For `href`, we must use $.attr(), instead of $.prop().
Refreshed the built css.
Refreshed zepto and zepto's touch.js (jqtouch-jquery). Fixed jqtouch-jquery (didn't know when it stopped working). Included zepto as git submodule. Added ant task to make it refreshing zepto easy. Move  out of  directory.
Updated `compass-recipes` location.
Renamed css class from  to . (the old name doesn't match its proper anymore.)
Moved  to  such that the regular build does not require uglifier gem.
Removed .active for tapped button.
XML and HTML Parse Libraries

Added reqiored libraries to do hw2
fixed alignment on contact page
closes #83, Remove MusicItemFactory
Remove leftover debug level
Initial git server (depot) module.
Fix: Parameter (to service) ensure failed: Invalid value 'restart'. Use 'start'.
Fix: duplicate declaration.
Bump to v0.10.0.
Update vendors.
Add link to ES6 draft spec for `Object.assign` and add more notes to the v0.10.0 changelog  to README.md.
Debug2 contains->containsKey
Fix for typo in setenv.sh.erb
now a fresh mod
SQL queries
Added function for creating csv
Merge branch 'master' of https://github.com/bharathravi/rts

Conflicts:
	com.example.attendeasyserver.AttendEasyServer/bin/classes/com/example/attendeasyserver/Database.class
	com.example.attendeasyserver.AttendEasyServer/src/com/example/attendeasyserver/Database.java
remove team from header, add to community page
add roadmap and strategy document
weapons and happy raptors
Remove object merge with cadence context.

Closes #38.
Merge branch `no-merge` into `master`.
Converted preprocessor tests.
Converted compiler tests.
Fixes refreshDisplay
Adds transitions to refreshDisplay
tied events into dialog box for now
dealing with events better
conc. code
Merge branch 'master' of github.com:bioinfocttj/pdp
Merge pull request #983 from laanwj/2012_03_removeunusedutil

Remove unused functions from util.h/util.cpp (EOM)
Update translations for bitcoin core

- Move scripts/qt to share/qt, to clean up toplevel directories
- Update english ts file which is used to source messages for Transifex
- In extract_strings_qt.py use a glob *.h *.cpp, this is safe now that the Wx UI files are removed
Merge pull request #1089 from laanwj/2012_04_translationupdate

Update translations for bitcoin core
python interpreter should not define the path
por silas
mergin
cambios
external: remove unused imKStoUCS files

We needed these files before libxkbcommon had a function to convert
keysyms to unicode, and then for the 'plain' keyboard backend, which
didn't use libxkbcommon. Since this backend was removed, these files are
no longer needed.

Signed-off-by: Ran Benita <ran234@gmail.com>
copying: remove no longer relevent sections

All of the (xkb) keyboard handling code was written by David and me;
even the old code was not based on xlib but written against the
specification (not entirely correctly, too). All of this logic was moved
to libxkbcommon, which we marely link against.

We also no longer carray our own uterm_keysyms.h file, so that section is
not relevant as well.

Signed-off-by: Ran Benita <ran234@gmail.com>
[add] tmx to json method in level model
adding missing files from the Config folder
resume in markdown is hawt
improved step font sized
rename preference dialog
add dependency to jdt nullable annotations
fixes location for step references
clean up
improve code completion for steps
fix anchors in html documentation
revert to id based anchors
regenerate tests & doc
windows support, wip
Relaxed error reporting for constraints that are not mentioned in the schema
[maven-release-plugin] prepare release hw1-bolei-0.0.5
Test commit with db backup
Test2 commit with db backup
Test3 commit with db backup
[fr] translation

correction titre
Keyboard
No sprites (canvas 2D drawing), bullet trails
Using amqp client to push federation bindings over a direct connection
Added location list page and link in nav bar
beginning timer screen layout
1.小组任务为查询到任务时，清空任务列表.
readme img path
Merge branch 'refs/heads/payutc' into transaction
Merge branch 'transaction' of github.com:buckutt/BuckUTT into transaction
Merge branch 'transaction' into payutc
[new feature] Casper est ici ;)
looking for tracing issue
Merge remote-tracking branch 'origin/devel' into devel
Merge branch 'master' into devel
correct name error into semectl.py
Merge pull request #12 from niamiot/devel

selectl corrected
added scripts relied upon by bot to central dir
dist delete
update work_change.txt
ProductListener
Password reset fix; email invite fix
Pointed to generic about page.
Merge branch 'master' of ssh://github.com/caylan/Bulletin
Fixed import spelling error (should be 'ugettext')
* add touch&scroll delay in CCScrollView for android
* add scroll view touch priority setting
* make scrollview do not scroll when content is not full
Mantis 0000269
Added gitignore
Ruby script to initialize vim bundles
Deleted vim/bundle directory from repo - replaced by the init_vim_bundles script
fix formatting
profiles and travis config to guard against test dependencies enabling undeclared library dependencies to succeed improperly (see gh-4)
debug class
topology class
Added a Wakanda studio extension to clear the multiple use of IDs in selectors
downgrade to azure 1.6

There are breaking changes in Azure 1.7
More 1.6
clean up and update usage info

-update readme with code path explanation
-clean up rpmutil.py
Add syntastic
Added snipmate
ignore temporary files in snipmate
apn on rails?
forgot to make counter caches not-nullable
Cipango-console:
 - Statistic Graphs are displayed by connection.
 - CPU graph now include system CPU
 - Add thread graph
Require PIL (as of e08d97661e4b4caaef30113ee3094b8f83b1c58f)
Requests - create a new Request initial view
Ноябрьское обновление
New cNaCl and ignore externals.
More platform specific bugs
adds gp
res menu bus and nonprofit details xml files
Working on btfe.pl
Take a stab and building the static Hedonistica site.
Align base template with existing styles.
Activate the admin site.
Add actual page records and get navigation working.
Add static image assets.
Update static files.
Add tabular content in views.
Remove database from versioning.
Create initial README
Remove DB file from versioning.
Remove DB file from versioning.
Integrate HTML5 Boilerplate.
Make minor styling changes
Clean up styles
Fix index view
Include modernizr and js folder
Freeze current requirements
Get mod_wsgi working for Apache
Remove .pyc files
Scale down static image content.
more grammar/punct/formatting
Report errors in fabric_db_update_listener

If we encountered an error in fabric_db_update_listener we would
silently return without reporting an error. This just throws any sort of
error response that we might encounter.
Monitor the db update listener process

We were waiting on a receive with an infinite timeout. If the update
process happened to exit before we tried asking for the current state we
would end up waiting forever for a response.

This just mimics the general gen:do_call/4 pattern of using a monitor to
make sure we know if the process has died.
Consider 'noreply' as a success for quorum check

The new_edits:false option suppresses responses.  We need to account for
that fact when tabulating success replies for the quorum check.  This
fixes a regression in Hodge.

BugzID: 15358
BugzID: 14953
Merge pull request #63 from cloudant/15358-replicator-writes-quorum-regression

Consider 'noreply' as a success for quorum check

BugzID: 15358
CMakeLists.txt: use -O0 for debug build

Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
fix mutex lock and unlock

Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
lock_unit: add test_thread_contention

* add test_thread_contention

* test_multi_mutex_lock should destroy the mutexes when it's done with
them.

Signed-off-by: Colin McCabe <cmccabe@alumni.cmu.edu>
[Solo*] fixup -q, -v, -p short options and bashcomp
[equo] update man pages
[client] update entropy.pot
Merge remote-tracking branch 'upstream/master'
Add plugin for jukebox.
Pushes jenkins html class toggle down to javascript.
aligned with release VSAO
aligned with release VSAO
Used fixed startId of -1 in LWW
index fixed-2
Added ping back from facebook posts to stories linked in the post.
Make the More button span the entire width of the space
Fixed bugs in texture coloring
made graphics/engine/text cleaner, I hope
Fog color fix; refactoring

- fixed fog color setting
- removed unused glSecondaryColor and altered struct VertexCol
- minor refactoring in CText
Merge master & dev
Tomorrow night updates
initial commit for cosmo opensource from freshinterval.com
[emacs] Markdown needs 4-space tabs, or lists break.
[emacs] Theme font-latex-slide-title-face.
Dot layout: attach dummy flag to dummy nodes in aux graph
dot: some reorganization to layout
Format acceptance criteria as bullet list
1. add usersave action
2. user role name def move to UserBusi
[cambios a los scripts]
Switch to CeCILL-B license.
Added dmg reduction depending on player's level
Added test for DefenceEntityListener
Push HW5
Change the radii a little bit...
saving my work before i loose it
more updates to map out the metrics request, this look pretty complicated  - need to rethink this approach
Little tweak.
Minor tweaks.
Clean up some non-C90 stuff.
Remove some debug code.
Remove C++ comments.
Refactored role assignment as we'll be needing it in a few places
Primeira versao do main.c
Working code! Test cases 1 through 6 successfully run.
Fixes related to adding new hosts
Enforce uniqueness of username and e-mail in person table
Added missing checks for admin-only actions
It appears that Pg support was previously not good enough, so Pg upgrade code was irrelevant and has been removed. In addition, the upgrade script will now continue even if SQL commands fail. Errors are logged to a file, so it will be easier to fix some errors without having to start over
correct B13, all non-Sicilian volume B fixes
Big Update
Big Update
Merge branch 'master' of https://github.com/cykor/VPNCykoGM

Conflicts:
	check.sh
updated interval and added boundary and range classes
updated range class to support multi range unite and intersect
Ticker functioning in segments
ARC #005 A, B

Haskell で解く練習。
B ってもうちょっと綺麗な書き方ありそう。
Remove hard-coded 80 column output

When stdout is detected to be a tty use the number of columns
specified by the terminal.  If that fails fall back to a default
80 column width.  In the non-tty case allow for 999 column lines.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Properly expose the mfu ghost list kstats

Due to a typo the mru ghost lists stats were accidentally being
exposed as the mfu ghost list stats.  This was harmless but
confusing since memory usage could be over reported.

Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Invoke notify-reboot-required for upgrades.

Call `/usr/share/update-notifier/notify-reboot-required` in the
zfs-dkms postinst script to advise the system that kernel module
upgrades are activated by a reboot.

Closes: dajhorn/pkg-zfs#25
Add libgcc_s.so.1 to the zfs-initramfs manifest.

The `zdb` utility requires pthreads for some functions, but the
necessary library is not automatically added to the initrd because
it is not detected as a dependency.

Closes: dajhorn/pkg-zfs#26
Add missing #DEBHELPER# macro to zfsutils.

The #DEBHELPER# macro was missing from the zfsutils.postinst file,
which caused a failure to register the /etc/init.d/zfs-mount and
/etc/init.d/zfs-share scripts through the update-rc.d utility.

For completeness, also add the #DEBHELPER# macro to the existing
zfsutils.postrm file, and create a zfsutils.prerm file for it too.

Closes: dajhorn/pkg-zfs#28
Refresh debian/patches after upstream merge.
Enable 0007-Integrate-ARC-more-tightly-with-Linux.patch
PPA 0.6.0.57-0ubuntu1 release.
Merge branch 'upstream' into master-new
pristine-tar data for zfs-0.6.0-rc8.tar.gz
pristine-tar data for zfs-0.6.0-rc9.tar.gz
pristine-tar data for zfs-0.6.0-rc10.tar.gz
[Panel] Allow arbitrary panel placements
Fix name of public function from _findFileInPath to findFileInPath
Shared history now actually works, hooray!
working with unixcw and does koch
limit search terms
Improved CheckOther::checkIncorrectLogicOperator:
- Implemented automatic swapping of conditions and operands
- Added several patterns
- Added support for conditions outside of if/while
Fixed/Improved description of -rp/--relative-paths
run astyle
Refactorizations in testrunner:
- Avoid creation of std::string instances of static strings where possible in testrunner.
- Removed unnecessary include of tinyxml.h in testcppcheck.cpp
fixing php syntax highlighter
Refactored views to simplify code
Updated to official 0.5.
all the basic stuff implemented

time to add some unit tests and start refactoring for readability. Also
need to revisit what the "monadic" approach is getting us. I only use
"bind" in like two places so maybe it's not worth it.
now running with ISR and GDT
clearly I didn't test to make sure that the registers were properly restored. Thanks go to sebzim4500 for finding this.
a much better halt subroutine; it doesn't overwrite a fixed address
can add bindings to environments now. (can't yet add new environments though)
Update of studentGrowthPlot_Styles to allow for plotting of four content areas
little css on the home page
Optimized two way communications.

Made some optimizations to two way communications, specifically removed
the issue of dead threads not being cleaned up. Two way communication is
now working acceptably.
Patch for high cpu load issue
Cleaner fix for high cpu load issue, fixes #260
Merge pull request #272 from silviorelli/master

High cpu load patch by @mauricio - fixes #260
streaming stuff works using websocket for now
collectd.conf.in: Add the numa plugin.
Merge pull request #43 from octo/ff/numa

numa plugin: Add plugin for Non-Uniform Memory Access (NUMA).
write_mongodb plugin: Export DS names and DS types.

The values are exported as an array now. This is very close to the way data is
exported as JSON.
write_mongodb plugin: Fix reconnection behavior.

The previous code would never detect a disconnect and act appropriately. In the
process, manual tracking of the connection state is removed in favor of
mongo_is_connected().
Merge branch 'master', remote-tracking branch 'upstream/master'
追加したスクリプトが実行属性ついてなかったので修正
search, watch, config
+ dodane widoki prezentujace rozwiazania dla poszczególnych zadań
fixed makefile to not recompile everything on every run
fixed some unneeded includes
12w21a compatible
12w22a compatible
added c++ ifdefs
made sure on_error is always called correctly
added a .so target and moved the example binary out of the bin directory
added static library target
added bindings section
added metadata type defines
added slot.h to mcnet.h
making sure we don't read outside what we're allowed when parsing metadata and slots
make sure slot data is initialised
fixed invalid start offset of string metadata
Merge branch 'release/0.0.5'
Set field sort and limit by catalog_facet param [refs #462]
Move all string hashes to typed 32-bit ints

Previously, all the hashes were structs with a 'base class' embedded in
them.  The base class contained only a uint32.  This change lightens the
representation to just a 'bare' (but typed) 32-bit int.

Murmur and SuperFastHash have more internal state, and thus are unable
to benefit from this optimization.

This benchmark tests an allocation + run of the golden test suite.

benchmark                      old ns/op    new ns/op    delta
BenchmarkAllocJava32               10776         9547  -11.40%
BenchmarkAllocDJB                  10885         9638  -11.46%
BenchmarkAllocElf32                18121        13837  -23.64%
BenchmarkAllocJenkins32            16554        10868  -34.35%
BenchmarkAllocSDBM32               11447        10687   -6.64%
BenchmarkAllocSQLite32             10673         9935   -6.91%
Adds unit tests for the 2-opt heuristic
Refactor the 2-opt heuristic code
Adds missing documentation
Fri Jul 27 11:00:21 MDT 2012
Clarify docs
Rename chainability to chaining
Change changing-svg-nodes to manipulating svg nodes
Change Manipulating SVG Nodes to Manipulation
Clarify docs
Clarify
Clarify docs
Merge branch 'master' of https://github.com/dharmafly/pablo
Add .classpath and .project to make sipXsqa an eclipse project
Behavior Example
Update RubyMotion readme
Update links in readme
Add some comments to Rakefile
Update RubyMotion readme
Remove unnecessary attr_readers in demo
Update readme
fixing up build scripts
add: most smart fetch hard feeds
add: most correct error handler while bot joins